Handle global filters.

2003-06-05  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle global
	filters.

diff --git a/ChangeLog b/ChangeLog
index e78160683559a082b6f7ddfdc3621b6202e8d2db..f07ab3003a57c500e537c98c55cf14614f074d8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle global
+       filters.
+
 2003-06-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c: Fix for #84668, reported by Torbjörn Andersson:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e78160683559a082b6f7ddfdc3621b6202e8d2db..f07ab3003a57c500e537c98c55cf14614f074d8f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-06-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle global
+       filters.
+
 2003-06-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c: Fix for #84668, reported by Torbjörn Andersson:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e78160683559a082b6f7ddfdc3621b6202e8d2db..f07ab3003a57c500e537c98c55cf14614f074d8f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-06-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle global
+       filters.
+
 2003-06-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c: Fix for #84668, reported by Torbjörn Andersson:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e78160683559a082b6f7ddfdc3621b6202e8d2db..f07ab3003a57c500e537c98c55cf14614f074d8f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-06-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle global
+       filters.
+
 2003-06-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c: Fix for #84668, reported by Torbjörn Andersson:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e78160683559a082b6f7ddfdc3621b6202e8d2db..f07ab3003a57c500e537c98c55cf14614f074d8f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-06-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle global
+       filters.
+
 2003-06-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c: Fix for #84668, reported by Torbjörn Andersson:

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index e35476086fb678ae3e0d71818fcb348a0589994b..ff70323ab97d119a6f5d6d15034fe3101e0d4a3e 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1901,6 +1901,23 @@ gdk_event_translate (GdkDisplay *display,
   if (ret_val_flagp)
     *ret_val_flagp = FALSE;
 
+  /* init these, since the done: block uses them */
+  ASSIGN_WINDOW (NULL);
+  event->any.window = NULL;
+
+  if (_gdk_default_filters)
+    {
+      /* Apply global filters */
+      GdkFilterReturn result;
+      result = gdk_event_apply_filters (msg, event, _gdk_default_filters);
+      
+      if (result != GDK_FILTER_CONTINUE)
+        {
+          return_val = (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
+          goto done;
+        }
+    }  
+
   ASSIGN_WINDOW (gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd));
   orig_window = window;