Minor cosmetics.

2002-12-17  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkglobals-win32.c: Minor cosmetics.

	Implement two missing functions (#101369)

	* gdk/win32/gdkevents-win32.c
	(gdk_display_add_client_message_filter): Implement by calling
	gdk_add_client_message_filter(), no separate displays on Windows,
	at least not yet.

	* gdk/win32/gdkgc-win32.c (gdk_gc_get_screen): Implement by
	returning the only screen so far, _gdk_screen.

diff --git a/ChangeLog b/ChangeLog
index 1ce2797c23646e9fa7e08b21480c034967df5eea..67ce50f450384dae79af901a885004b15eb4a47f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-12-17  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkglobals-win32.c: Minor cosmetics.
+
+       Implement two missing functions (#101369)
+
+       * gdk/win32/gdkevents-win32.c
+       (gdk_display_add_client_message_filter): Implement by calling
+       gdk_add_client_message_filter(), no separate displays on Windows,
+       at least not yet.
+
+       * gdk/win32/gdkgc-win32.c (gdk_gc_get_screen): Implement by
+       returning the only screen so far, _gdk_screen.
+
 Mon Dec 16 16:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1ce2797c23646e9fa7e08b21480c034967df5eea..67ce50f450384dae79af901a885004b15eb4a47f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+2002-12-17  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkglobals-win32.c: Minor cosmetics.
+
+       Implement two missing functions (#101369)
+
+       * gdk/win32/gdkevents-win32.c
+       (gdk_display_add_client_message_filter): Implement by calling
+       gdk_add_client_message_filter(), no separate displays on Windows,
+       at least not yet.
+
+       * gdk/win32/gdkgc-win32.c (gdk_gc_get_screen): Implement by
+       returning the only screen so far, _gdk_screen.
+
 Mon Dec 16 16:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1ce2797c23646e9fa7e08b21480c034967df5eea..67ce50f450384dae79af901a885004b15eb4a47f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+2002-12-17  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkglobals-win32.c: Minor cosmetics.
+
+       Implement two missing functions (#101369)
+
+       * gdk/win32/gdkevents-win32.c
+       (gdk_display_add_client_message_filter): Implement by calling
+       gdk_add_client_message_filter(), no separate displays on Windows,
+       at least not yet.
+
+       * gdk/win32/gdkgc-win32.c (gdk_gc_get_screen): Implement by
+       returning the only screen so far, _gdk_screen.
+
 Mon Dec 16 16:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1ce2797c23646e9fa7e08b21480c034967df5eea..67ce50f450384dae79af901a885004b15eb4a47f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+2002-12-17  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkglobals-win32.c: Minor cosmetics.
+
+       Implement two missing functions (#101369)
+
+       * gdk/win32/gdkevents-win32.c
+       (gdk_display_add_client_message_filter): Implement by calling
+       gdk_add_client_message_filter(), no separate displays on Windows,
+       at least not yet.
+
+       * gdk/win32/gdkgc-win32.c (gdk_gc_get_screen): Implement by
+       returning the only screen so far, _gdk_screen.
+
 Mon Dec 16 16:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1ce2797c23646e9fa7e08b21480c034967df5eea..67ce50f450384dae79af901a885004b15eb4a47f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+2002-12-17  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkglobals-win32.c: Minor cosmetics.
+
+       Implement two missing functions (#101369)
+
+       * gdk/win32/gdkevents-win32.c
+       (gdk_display_add_client_message_filter): Implement by calling
+       gdk_add_client_message_filter(), no separate displays on Windows,
+       at least not yet.
+
+       * gdk/win32/gdkgc-win32.c (gdk_gc_get_screen): Implement by
+       returning the only screen so far, _gdk_screen.
+
 Mon Dec 16 16:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1ce2797c23646e9fa7e08b21480c034967df5eea..67ce50f450384dae79af901a885004b15eb4a47f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+2002-12-17  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkglobals-win32.c: Minor cosmetics.
+
+       Implement two missing functions (#101369)
+
+       * gdk/win32/gdkevents-win32.c
+       (gdk_display_add_client_message_filter): Implement by calling
+       gdk_add_client_message_filter(), no separate displays on Windows,
+       at least not yet.
+
+       * gdk/win32/gdkgc-win32.c (gdk_gc_get_screen): Implement by
+       returning the only screen so far, _gdk_screen.
+
 Mon Dec 16 16:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 7ae4739ff261e1471c5fa655349318e99555de39..ca1ce112d5d812d994c40b7c18876ec946b05065 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -775,6 +775,16 @@ gdk_event_apply_filters (MSG      *msg,
   return GDK_FILTER_CONTINUE;
 }
 
+void 
+gdk_display_add_client_message_filter (GdkDisplay   *display,
+                                      GdkAtom       message_type,
+                                      GdkFilterFunc func,
+                                      gpointer      data)
+{
+  /* XXX */
+  gdk_add_client_message_filter (message_type, func, data);
+}
+
 void 
 gdk_add_client_message_filter (GdkAtom       message_type,
                               GdkFilterFunc func,

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index 70c1ad2daeb8c26cfb9cc85235e277309fb503a9..66b90dfb4f6790f0a7c506996ccbc1638e8bf895 100644 (file)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -730,6 +730,14 @@ gdk_gc_copy (GdkGC *dst_gc,
                                          sizeof (DWORD) * src_win32_gc->pen_num_dashes);
 }
 
+GdkScreen *  
+gdk_gc_get_screen (GdkGC *gc)
+{
+  g_return_val_if_fail (GDK_IS_GC_WIN32 (gc), NULL);
+  
+  return _gdk_screen;
+}
+
 static guint bitmask[9] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
 
 COLORREF

diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index fb005e27865c30d45f529f8aa50925a80adffe62..7d3cd7855feb1900da260ff1a67c6f1e108a707e 100644 (file)
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -28,9 +28,9 @@
 #include "gdktypes.h"
 #include "gdkprivate-win32.h"
 
-GdkDisplay *_gdk_display = NULL;
-GdkScreen *_gdk_screen = NULL;
-GdkWindow *_gdk_parent_root = NULL;
+GdkDisplay      *_gdk_display = NULL;
+GdkScreen       *_gdk_screen = NULL;
+GdkWindow       *_gdk_parent_root = NULL;
 
 HWND              _gdk_root_window = NULL;
 HDC              _gdk_display_hdc;