Cosmetics.

diff --git a/ChangeLog b/ChangeLog
index 6fd6719f27b9266c57c677ff190e75c419b7e04c..58945460d8c7cbbdab4fe4466e4cae6f580d6d2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@
 
        * gdk/win32/gdkevents-win32.c: Remove ifdeffed out code relating
        to the gdk-ping message. Use the global _gdk_display instead of
-       calling gdk_display_get_default() which would return _gdk_display
-       anyway.
+       calling gdk_display_get_default() or gdk_drawable_get_display()
+       which would return _gdk_display anyway.
 
        (append_event, apply_filters, gdk_event_translate): Drop any
        GdkDisplay parameter as we only have one display anyway. Use

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6fd6719f27b9266c57c677ff190e75c419b7e04c..58945460d8c7cbbdab4fe4466e4cae6f580d6d2a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -2,8 +2,8 @@
 
        * gdk/win32/gdkevents-win32.c: Remove ifdeffed out code relating
        to the gdk-ping message. Use the global _gdk_display instead of
-       calling gdk_display_get_default() which would return _gdk_display
-       anyway.
+       calling gdk_display_get_default() or gdk_drawable_get_display()
+       which would return _gdk_display anyway.
 
        (append_event, apply_filters, gdk_event_translate): Drop any
        GdkDisplay parameter as we only have one display anyway. Use

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6fd6719f27b9266c57c677ff190e75c419b7e04c..58945460d8c7cbbdab4fe4466e4cae6f580d6d2a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -2,8 +2,8 @@
 
        * gdk/win32/gdkevents-win32.c: Remove ifdeffed out code relating
        to the gdk-ping message. Use the global _gdk_display instead of
-       calling gdk_display_get_default() which would return _gdk_display
-       anyway.
+       calling gdk_display_get_default() or gdk_drawable_get_display()
+       which would return _gdk_display anyway.
 
        (append_event, apply_filters, gdk_event_translate): Drop any
        GdkDisplay parameter as we only have one display anyway. Use

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 73394dcb6286b8ed8459e674a2117e902c50a286..e73fdc508c38477dd8b7d31a4466224cdd542584 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2089,7 +2089,7 @@ handle_wm_paint (MSG        *msg,
     {
       if (!GDK_WINDOW_DESTROYED (window))
        {
-         GList *list = gdk_drawable_get_display (window)->queued_events;
+         GList *list = _gdk_display->queued_events;
 
          *event = gdk_event_new (GDK_EXPOSE);
          (*event)->expose.window = window;
@@ -2221,15 +2221,13 @@ gdk_event_translate (MSG  *msg,
     {
       /* Apply global filters */
 
-      GdkFilterReturn result =
-       apply_filters (NULL, msg, _gdk_default_filters);
+      GdkFilterReturn result = apply_filters (NULL, msg, _gdk_default_filters);
       
       /* If result is GDK_FILTER_CONTINUE, we continue as if nothing
        * happened. If it is GDK_FILTER_REMOVE or GDK_FILTER_TRANSLATE,
        * we return TRUE, and DefWindowProc() will not be called.
        */
-      if (result == GDK_FILTER_REMOVE ||
-         result == GDK_FILTER_TRANSLATE)
+      if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
        return TRUE;
     }
 
@@ -2283,8 +2281,7 @@ gdk_event_translate (MSG  *msg,
     {
       /* Apply per-window filters */
 
-      GdkFilterReturn result =
-       apply_filters (window, msg, ((GdkWindowObject *) window)->filters);
+      GdkFilterReturn result = apply_filters (window, msg, ((GdkWindowObject *) window)->filters);
 
       if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
        {
@@ -2369,8 +2366,7 @@ gdk_event_translate (MSG  *msg,
            }
        }
 
-      if (result == GDK_FILTER_REMOVE ||
-         result == GDK_FILTER_TRANSLATE)
+      if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
        {
          return_val = TRUE;
          goto done;
@@ -2864,7 +2860,6 @@ gdk_event_translate (MSG  *msg,
       event->scroll.window = window;
       event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
        GDK_SCROLL_UP : GDK_SCROLL_DOWN;
-      event->scroll.window = window;
       event->scroll.time = _gdk_win32_get_next_tick (msg->time);
       _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
       event->scroll.x = (gint16) point.x + xoffset;