Minor Windows adjustments

This commit is contained in:
Thomas Pöchtrager
2015-08-09 17:24:10 +02:00
parent 23e7bdebcf
commit 3604aecf8f
6 changed files with 19 additions and 11 deletions

View File

@ -7,7 +7,7 @@
// GL3W/GLFW
#include <GL/gl3w.h>
#include <GLFW/glfw3.h>
#ifdef _MSC_VER
#ifdef _WIN32
#undef APIENTRY
#define GLFW_EXPOSE_NATIVE_WIN32
#define GLFW_EXPOSE_NATIVE_WGL
@ -253,7 +253,7 @@ bool ImGui_ImplGlfwGL3_Init(GLFWwindow* window, bool install_callbacks)
io.RenderDrawListsFn = ImGui_ImplGlfwGL3_RenderDrawLists;
io.SetClipboardTextFn = ImGui_ImplGlfwGL3_SetClipboardText;
io.GetClipboardTextFn = ImGui_ImplGlfwGL3_GetClipboardText;
#ifdef _MSC_VER
#ifdef _WIN32
io.ImeWindowHandle = glfwGetWin32Window(g_Window);
#endif