diff options
| author | David Robillard <d@drobilla.net> | 2016-09-19 23:10:58 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-09-19 23:10:58 -0400 |
| commit | cfe092dab893966db823a087ad92f17619e12f45 (patch) | |
| tree | fcaa3f07a8252d01cb69072e4e256f70172058df | |
| parent | 69b2d6336b3598957a59a37a6bc95bcb154bab95 (diff) | |
Fix compilation on Windows
| -rw-r--r-- | pugl/event.h | 3 | ||||
| -rw-r--r-- | pugl/pugl_win.cpp | 12 | ||||
| -rw-r--r-- | pugl_test.c | 1 |
3 files changed, 2 insertions, 14 deletions
diff --git a/pugl/event.h b/pugl/event.h index 4b83488..30fd168 100644 --- a/pugl/event.h +++ b/pugl/event.h @@ -242,9 +242,10 @@ typedef union { PuglEventAny any; /**< Valid for all event types. */ PuglEventButton button; /**< PUGL_BUTTON_PRESS, PUGL_BUTTON_RELEASE. */ PuglEventConfigure configure; /**< PUGL_CONFIGURE. */ - PuglEventCrossing crossing; /**< PUGL_ENTER_NOTIFY, PUGL_LEAVE_NOTIFY. */ PuglEventExpose expose; /**< PUGL_EXPOSE. */ + PuglEventClose close; /**< PUGL_CLOSE. */ PuglEventKey key; /**< PUGL_KEY_PRESS, PUGL_KEY_RELEASE. */ + PuglEventCrossing crossing; /**< PUGL_ENTER_NOTIFY, PUGL_LEAVE_NOTIFY. */ PuglEventMotion motion; /**< PUGL_MOTION_NOTIFY. */ PuglEventScroll scroll; /**< PUGL_SCROLL. */ PuglEventFocus focus; /**< PUGL_FOCUS_IN, PUGL_FOCUS_OUT. */ diff --git a/pugl/pugl_win.cpp b/pugl/pugl_win.cpp index 70bf98c..874abba 100644 --- a/pugl/pugl_win.cpp +++ b/pugl/pugl_win.cpp @@ -268,17 +268,6 @@ keySymToSpecial(int sym) return (PuglKey)0; } -static void -setModifiers(PuglView* view) -{ - view->mods = 0; - view->mods |= (GetKeyState(VK_SHIFT) < 0) ? PUGL_MOD_SHIFT : 0; - view->mods |= (GetKeyState(VK_CONTROL) < 0) ? PUGL_MOD_CTRL : 0; - view->mods |= (GetKeyState(VK_MENU) < 0) ? PUGL_MOD_ALT : 0; - view->mods |= (GetKeyState(VK_LWIN) < 0) ? PUGL_MOD_SUPER : 0; - view->mods |= (GetKeyState(VK_RWIN) < 0) ? PUGL_MOD_SUPER : 0; -} - static unsigned int getModifiers() { @@ -477,7 +466,6 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam) event.any.flags |= PUGL_IS_SEND_EVENT; } - setModifiers(view); switch (message) { case WM_CREATE: case WM_SHOWWINDOW: diff --git a/pugl_test.c b/pugl_test.c index 5c4ab9c..4a3d066 100644 --- a/pugl_test.c +++ b/pugl_test.c @@ -243,7 +243,6 @@ main(int argc, char** argv) puglCreateWindow(view, "Pugl Test"); puglEnterContext(view); - glEnable(GL_MULTISAMPLE); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LESS); glClearColor(0.2f, 0.2f, 0.2f, 1.0f); |