Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 20:07:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ifdef freeglut extensions properly

Browse Source
This commit is contained in:
Andrew Willmott 2019-04-02 16:07:28 +01:00 committed by omar
parent 81f70e5b7c
commit 3fad375f5f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_freeglut_opengl2/main.cpp
View File

@ -91,7 +91,7 @@ int main(int argc, char** argv)
{ {
// Create GLUT window // Create GLUT window
glutInit(&argc, argv); glutInit(&argc, argv);
#ifndef __APPLE__ #ifdef __FREEGLUT_EXT_H__
glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS); glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
#endif #endif
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_MULTISAMPLE); glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_MULTISAMPLE);

4
examples/imgui_impl_freeglut.cpp
View File

@ -72,7 +72,7 @@ void ImGui_ImplFreeGLUT_InstallFuncs()
glutMotionFunc(ImGui_ImplFreeGLUT_MotionFunc); glutMotionFunc(ImGui_ImplFreeGLUT_MotionFunc);
glutPassiveMotionFunc(ImGui_ImplFreeGLUT_MotionFunc); glutPassiveMotionFunc(ImGui_ImplFreeGLUT_MotionFunc);
glutMouseFunc(ImGui_ImplFreeGLUT_MouseFunc); glutMouseFunc(ImGui_ImplFreeGLUT_MouseFunc);
#ifndef __APPLE__ #ifdef __FREEGLUT_EXT_H__
glutMouseWheelFunc(ImGui_ImplFreeGLUT_MouseWheelFunc); glutMouseWheelFunc(ImGui_ImplFreeGLUT_MouseWheelFunc);
#endif #endif
glutKeyboardFunc(ImGui_ImplFreeGLUT_KeyboardFunc); glutKeyboardFunc(ImGui_ImplFreeGLUT_KeyboardFunc);
@ -181,6 +181,7 @@ void ImGui_ImplFreeGLUT_MouseFunc(int glut_button, int state, int x, int y)
io.MouseDown[button] = false; io.MouseDown[button] = false;
} }
#ifdef __FREEGLUT_EXT_H__
void ImGui_ImplFreeGLUT_MouseWheelFunc(int button, int dir, int x, int y) void ImGui_ImplFreeGLUT_MouseWheelFunc(int button, int dir, int x, int y)
{ {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
@ -191,6 +192,7 @@ void ImGui_ImplFreeGLUT_MouseWheelFunc(int button, int dir, int x, int y)
io.MouseWheel -= 1.0; io.MouseWheel -= 1.0;
(void)button; // Unused (void)button; // Unused
} }
#endif
void ImGui_ImplFreeGLUT_ReshapeFunc(int w, int h) void ImGui_ImplFreeGLUT_ReshapeFunc(int w, int h)
{ {