aboutsummaryrefslogtreecommitdiff
path: root/pugl
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2016-09-19 23:10:58 -0400
committerDavid Robillard <d@drobilla.net>2016-09-19 23:10:58 -0400
commitcfe092dab893966db823a087ad92f17619e12f45 (patch)
treefcaa3f07a8252d01cb69072e4e256f70172058df /pugl
parent69b2d6336b3598957a59a37a6bc95bcb154bab95 (diff)
downloadsynthpod-cfe092dab893966db823a087ad92f17619e12f45.tar.xz
Fix compilation on Windows
Diffstat (limited to 'pugl')
-rw-r--r--pugl/event.h3
-rw-r--r--pugl/pugl_win.cpp12
2 files changed, 2 insertions, 13 deletions
diff --git a/pugl/event.h b/pugl/event.h
index 4b834883..30fd168a 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 70bf98c1..874abba7 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: