summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2009-03-11 12:50:51 +0000
committerTor Lillqvist <tml@src.gnome.org>2009-03-11 12:50:51 +0000
commit93bb740db361e4ec2154ccee7231686dd8737db1 (patch)
tree817f3e3570b10e7f431d4fd43fc2d06b2f327f33
parent94d290db654de185ad68172446c1ec1abe7c8d7f (diff)
downloadgtk+-93bb740db361e4ec2154ccee7231686dd8737db1.tar.gz
Bug 570896 - gdkevents-win32.c(2947) : error C4053: one void operand for
2009-03-11 Tor Lillqvist <tml@iki.fi> Bug 570896 - gdkevents-win32.c(2947) : error C4053: one void operand for '?:' * gdk/win32/gdkevents-win32.c (gdk_event_translate): Fix compilation error with MSVC. While at it add clarifying comments and fix a typo in the debugging output. svn path=/trunk/; revision=22515
-rw-r--r--ChangeLog9
-rw-r--r--gdk/win32/gdkevents-win32.c8
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eadcb076ec..6a4ed2de8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-03-11 Tor Lillqvist <tml@iki.fi>
+ Bug 570896 - gdkevents-win32.c(2947) : error C4053: one void
+ operand for '?:'
+
+ * gdk/win32/gdkevents-win32.c (gdk_event_translate): Fix
+ compilation error with MSVC. While at it add clarifying comments
+ and fix a typo in the debugging output.
+
+2009-03-11 Tor Lillqvist <tml@iki.fi>
+
Bug 574794 - Can not resize shaped windows on Windows
* gdk/win32/gdkevents-win32.c (gdk_event_translate): On handling
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 572a9d09af..b37fec325a 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2930,6 +2930,7 @@ gdk_event_translate (MSG *msg,
break;
case WM_HSCROLL:
+ /* Just print more debugging information, don't actually handle it. */
GDK_NOTE (EVENTS,
(g_print (" %s",
(LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
@@ -2944,17 +2945,18 @@ gdk_event_translate (MSG *msg,
"???")))))))))),
(LOWORD (msg->wParam) == SB_THUMBPOSITION ||
LOWORD (msg->wParam) == SB_THUMBTRACK) ?
- g_print (" %d", HIWORD (msg->wParam)) : 0));
+ (g_print (" %d", HIWORD (msg->wParam)), 0) : 0));
break;
case WM_VSCROLL:
+ /* Just print more debugging information, don't actually handle it. */
GDK_NOTE (EVENTS,
(g_print (" %s",
(LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
(LOWORD (msg->wParam) == SB_BOTTOM ? "BOTTOM" :
(LOWORD (msg->wParam) == SB_TOP ? "TOP" :
(LOWORD (msg->wParam) == SB_LINEDOWN ? "LINDOWN" :
- (LOWORD (msg->wParam) == SB_LINEUP ? "LINEIP" :
+ (LOWORD (msg->wParam) == SB_LINEUP ? "LINEUP" :
(LOWORD (msg->wParam) == SB_PAGEDOWN ? "PAGEDOWN" :
(LOWORD (msg->wParam) == SB_PAGEUP ? "PAGEUP" :
(LOWORD (msg->wParam) == SB_THUMBPOSITION ? "THUMBPOSITION" :
@@ -2962,7 +2964,7 @@ gdk_event_translate (MSG *msg,
"???")))))))))),
(LOWORD (msg->wParam) == SB_THUMBPOSITION ||
LOWORD (msg->wParam) == SB_THUMBTRACK) ?
- g_print (" %d", HIWORD (msg->wParam)) : 0));
+ (g_print (" %d", HIWORD (msg->wParam)), 0) : 0));
break;
case WM_QUERYNEWPALETTE: