Commit ec9429b8 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Merge from stable:

2003-02-01  Tor Lillqvist  <tml@iki.fi>

	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.
parent 73710648
2003-02-01 Tor Lillqvist <tml@iki.fi>
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 <yosh@gimp.org>
* demos/pixbuf-demo.c
......
2003-02-01 Tor Lillqvist <tml@iki.fi>
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 <yosh@gimp.org>
* demos/pixbuf-demo.c
......
2003-02-01 Tor Lillqvist <tml@iki.fi>
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 <yosh@gimp.org>
* demos/pixbuf-demo.c
......
2003-02-01 Tor Lillqvist <tml@iki.fi>
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 <yosh@gimp.org>
* demos/pixbuf-demo.c
......
2003-02-01 Tor Lillqvist <tml@iki.fi>
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 <yosh@gimp.org>
* demos/pixbuf-demo.c
......
......@@ -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
......
......@@ -30,6 +30,8 @@
#include <string.h>
#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);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment