diff options
| author | Kristian Rietveld <kris@gtk.org> | 2002-12-09 23:34:49 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2002-12-09 23:34:49 +0000 |
| commit | 00185e7ed197059ed572066217a076ec80403f3a (patch) | |
| tree | 03d50e3946a77d0c885252974f15aea8d3a9b5f9 /gdk/gdkpixmap.c | |
| parent | 7c2489e953f68bced5c25b4c0d1aa7bb6b26b415 (diff) | |
| download | gtk+-00185e7ed197059ed572066217a076ec80403f3a.tar.gz | |
update to allow a GdkDrawable instead of a GdkWindow.
Tue Dec 10 00:49:35 2002 Kristian Rietveld <kris@gtk.org>
* gdk/gdkpixmap.h (gdk_pixmap_new), (gdk_bitmap_create_from_data),
(gdk_pixmap_create_from_xpm), (gdk_pixmap_colormap_create_from_xpm),
(gdk_pixmap_create_from_xpm_d),
(gdk_pixmap_colormap_create_from_xpm_d): update to allow a
GdkDrawable instead of a GdkWindow.
* gdk/gdkpixmap.c (gdk_pixmap_colormap_create_from_xpm),
(gdk_pixmap_create_from_xpm), (gdk_pixmap_colormap_create_from_xpm_d),
(gdk_pixmap_create_from_xpm_d): update to allow a GdkDrawable
instead of a GdkWindow.
* gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new),
(gdk_bitmap_create_from_data), (gdk_pixmap_create_from_data): update
to allow a GdkDrawable instead of a GdkWindow.
* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_new),
(gdk_bitmap_create_from_data), (gdk_pixmap_create_from_data): likewise
Diffstat (limited to 'gdk/gdkpixmap.c')
| -rw-r--r-- | gdk/gdkpixmap.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index d73647fbe0..f0134c21ec 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -551,7 +551,7 @@ gdk_pixmap_colormap_new_from_pixbuf (GdkColormap *colormap, } GdkPixmap* -gdk_pixmap_colormap_create_from_xpm (GdkWindow *window, +gdk_pixmap_colormap_create_from_xpm (GdkDrawable *drawable, GdkColormap *colormap, GdkBitmap **mask, GdkColor *transparent_color, @@ -560,12 +560,12 @@ gdk_pixmap_colormap_create_from_xpm (GdkWindow *window, GdkPixbuf *pixbuf; GdkPixmap *pixmap; - g_return_val_if_fail (window != NULL || colormap != NULL, NULL); - g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL); + g_return_val_if_fail (drawable != NULL || colormap != NULL, NULL); + g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL); g_return_val_if_fail (colormap == NULL || GDK_IS_COLORMAP (colormap), NULL); if (colormap == NULL) - colormap = gdk_drawable_get_colormap (window); + colormap = gdk_drawable_get_colormap (drawable); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); if (!pixbuf) @@ -579,17 +579,17 @@ gdk_pixmap_colormap_create_from_xpm (GdkWindow *window, } GdkPixmap* -gdk_pixmap_create_from_xpm (GdkWindow *window, - GdkBitmap **mask, - GdkColor *transparent_color, +gdk_pixmap_create_from_xpm (GdkDrawable *drawable, + GdkBitmap **mask, + GdkColor *transparent_color, const gchar *filename) { - return gdk_pixmap_colormap_create_from_xpm (window, NULL, mask, + return gdk_pixmap_colormap_create_from_xpm (drawable, NULL, mask, transparent_color, filename); } GdkPixmap* -gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window, +gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable, GdkColormap *colormap, GdkBitmap **mask, GdkColor *transparent_color, @@ -598,12 +598,12 @@ gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window, GdkPixbuf *pixbuf; GdkPixmap *pixmap; - g_return_val_if_fail (window != NULL || colormap != NULL, NULL); - g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL); + g_return_val_if_fail (drawable != NULL || colormap != NULL, NULL); + g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL); g_return_val_if_fail (colormap == NULL || GDK_IS_COLORMAP (colormap), NULL); if (colormap == NULL) - colormap = gdk_drawable_get_colormap (window); + colormap = gdk_drawable_get_colormap (drawable); pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)data); if (!pixbuf) @@ -617,12 +617,12 @@ gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window, } GdkPixmap* -gdk_pixmap_create_from_xpm_d (GdkWindow *window, - GdkBitmap **mask, - GdkColor *transparent_color, - gchar **data) +gdk_pixmap_create_from_xpm_d (GdkDrawable *drawable, + GdkBitmap **mask, + GdkColor *transparent_color, + gchar **data) { - return gdk_pixmap_colormap_create_from_xpm_d (window, NULL, mask, + return gdk_pixmap_colormap_create_from_xpm_d (drawable, NULL, mask, transparent_color, data); } |