From 7ed6dc1da84e8716463e819144aa9a4649f36568 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 17 Dec 2002 01:39:11 +0000 Subject: [PATCH] Minor cosmetics. 2002-12-17 Tor Lillqvist * 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. --- ChangeLog | 14 ++++++++++++++ ChangeLog.pre-2-10 | 14 ++++++++++++++ ChangeLog.pre-2-2 | 14 ++++++++++++++ ChangeLog.pre-2-4 | 14 ++++++++++++++ ChangeLog.pre-2-6 | 14 ++++++++++++++ ChangeLog.pre-2-8 | 14 ++++++++++++++ gdk/win32/gdkevents-win32.c | 10 ++++++++++ gdk/win32/gdkgc-win32.c | 8 ++++++++ gdk/win32/gdkglobals-win32.c | 6 +++--- 9 files changed, 105 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ce2797c2..67ce50f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2002-12-17 Tor Lillqvist + + * 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 * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1ce2797c2..67ce50f45 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2002-12-17 Tor Lillqvist + + * 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 * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1ce2797c2..67ce50f45 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +2002-12-17 Tor Lillqvist + + * 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 * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1ce2797c2..67ce50f45 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2002-12-17 Tor Lillqvist + + * 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 * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1ce2797c2..67ce50f45 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2002-12-17 Tor Lillqvist + + * 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 * gtk/gtktexttag.c (gtk_text_tag_get_property): Get rid diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1ce2797c2..67ce50f45 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2002-12-17 Tor Lillqvist + + * 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 * 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 7ae4739ff..ca1ce112d 100644 --- 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 70c1ad2da..66b90dfb4 100644 --- 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 fb005e278..7d3cd7855 100644 --- 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; -- 2.43.2