From ec9429b84da422084c8295f5b6a4dca65fea5dc5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 1 Feb 2003 21:05:09 +0000 Subject: [PATCH] Merge from stable: 2003-02-01 Tor Lillqvist Merge from stable: * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display, gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement. (#104108, Naofumi Yasufuku) * gdk/gdk.def: Export the above. Export gdk_screen_get_system_visual, noticed by Ed Woods. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gdk/gdk.def | 4 ++++ gdk/win32/gdkpixmap-win32.c | 27 +++++++++++++++++++++++++++ 7 files changed, 86 insertions(+) diff --git a/ChangeLog b/ChangeLog index f31c7772c3..c49a0c868e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-02-01 Tor Lillqvist + + Merge from stable: + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display, + gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement. + (#104108, Naofumi Yasufuku) + + * gdk/gdk.def: Export the above. Export + gdk_screen_get_system_visual, noticed by Ed Woods. + Fri Jan 31 17:45:22 2003 Manish Singh * demos/pixbuf-demo.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f31c7772c3..c49a0c868e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2003-02-01 Tor Lillqvist + + Merge from stable: + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display, + gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement. + (#104108, Naofumi Yasufuku) + + * gdk/gdk.def: Export the above. Export + gdk_screen_get_system_visual, noticed by Ed Woods. + Fri Jan 31 17:45:22 2003 Manish Singh * demos/pixbuf-demo.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f31c7772c3..c49a0c868e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +2003-02-01 Tor Lillqvist + + Merge from stable: + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display, + gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement. + (#104108, Naofumi Yasufuku) + + * gdk/gdk.def: Export the above. Export + gdk_screen_get_system_visual, noticed by Ed Woods. + Fri Jan 31 17:45:22 2003 Manish Singh * demos/pixbuf-demo.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f31c7772c3..c49a0c868e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +2003-02-01 Tor Lillqvist + + Merge from stable: + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display, + gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement. + (#104108, Naofumi Yasufuku) + + * gdk/gdk.def: Export the above. Export + gdk_screen_get_system_visual, noticed by Ed Woods. + Fri Jan 31 17:45:22 2003 Manish Singh * demos/pixbuf-demo.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f31c7772c3..c49a0c868e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2003-02-01 Tor Lillqvist + + Merge from stable: + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_foreign_new_for_display, + gdk_pixmap_lookup, gdk_pixmap_lookup_for_display): Implement. + (#104108, Naofumi Yasufuku) + + * gdk/gdk.def: Export the above. Export + gdk_screen_get_system_visual, noticed by Ed Woods. + Fri Jan 31 17:45:22 2003 Manish Singh * demos/pixbuf-demo.c diff --git a/gdk/gdk.def b/gdk/gdk.def index a1e2bfb3ba..dfc68c69c6 100644 --- a/gdk/gdk.def +++ b/gdk/gdk.def @@ -296,6 +296,9 @@ EXPORTS gdk_pixmap_create_from_xpm_d gdk_pixmap_foreign_new gdk_pixmap_get_type + gdk_pixmap_foreign_new_for_display + gdk_pixmap_lookup + gdk_pixmap_lookup_for_display gdk_pixmap_new gdk_pointer_grab gdk_pointer_grab_info_libgtk_only @@ -359,6 +362,7 @@ EXPORTS gdk_screen_get_root_window gdk_screen_get_setting gdk_screen_get_system_colormap + gdk_screen_get_system_visual gdk_screen_get_toplevel_windows gdk_screen_get_type gdk_screen_get_width diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c index 00f090fd5a..4935a6f774 100644 --- a/gdk/win32/gdkpixmap-win32.c +++ b/gdk/win32/gdkpixmap-win32.c @@ -30,6 +30,8 @@ #include #include "gdkpixmap.h" +#include "gdkdisplay.h" + #include "gdkprivate-win32.h" static void gdk_pixmap_impl_win32_get_size (GdkDrawable *drawable, @@ -440,6 +442,16 @@ gdk_pixmap_create_from_data (GdkDrawable *drawable, return result; } +GdkPixmap * +gdk_pixmap_foreign_new_for_display (GdkDisplay *display, + GdkNativeWindow anid) +{ + g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + g_return_val_if_fail (display == _gdk_display, NULL); + + return gdk_pixmap_foreign_new (anid); +} + GdkPixmap* gdk_pixmap_foreign_new (GdkNativeWindow anid) { @@ -479,3 +491,18 @@ gdk_pixmap_foreign_new (GdkNativeWindow anid) return pixmap; } + +GdkPixmap* +gdk_pixmap_lookup (GdkNativeWindow anid) +{ + return (GdkPixmap*) gdk_win32_handle_table_lookup (anid); +} + +GdkPixmap* +gdk_pixmap_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid) +{ + g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + g_return_val_if_fail (display == _gdk_display, NULL); + + return gdk_pixmap_lookup (anid); +}