gtk+ r22514 - in branches/gtk-2-14: . gdk/win32

[tml svn gnome org]

Author: tml
Date: Wed Mar 11 12:49:19 2009
New Revision: 22514
URL: http://svn.gnome.org/viewvc/gtk+?rev=22514&view=rev

Log:
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.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk/win32/gdkevents-win32.c

Modified: branches/gtk-2-14/gdk/win32/gdkevents-win32.c
==============================================================================
--- branches/gtk-2-14/gdk/win32/gdkevents-win32.c	(original)
+++ branches/gtk-2-14/gdk/win32/gdkevents-win32.c	Wed Mar 11 12:49:19 2009
@@ -2933,6 +2933,7 @@
       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" :
@@ -2947,17 +2948,18 @@
 				   "???")))))))))),
 		 (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" :
@@ -2965,7 +2967,7 @@
 				   "???")))))))))),
 		 (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: