diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2000-03-28 01:24:44 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-03-28 01:24:44 +0000 |
| commit | 8098546227671a5d082fdf8f4811ee3ffca7f6d8 (patch) | |
| tree | d1857c89ee73451cbb04bbf595c0dc8bade55987 /gdk/x11/gdkpixmap-x11.c | |
| parent | 4238d406e928d1afd95ab0c6ae51b6a37f9780ea (diff) | |
| download | gtk+-8098546227671a5d082fdf8f4811ee3ffca7f6d8.tar.gz | |
Merge no-flicker branch into HEAD
Diffstat (limited to 'gdk/x11/gdkpixmap-x11.c')
| -rw-r--r-- | gdk/x11/gdkpixmap-x11.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 45807cb613..f1822aabd3 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -33,8 +33,7 @@ #include <X11/Xlib.h> #include "gdkpixmap.h" -#include "gdkprivate.h" -#include "gdkx.h" +#include "gdkprivate-x11.h" typedef struct { @@ -119,6 +118,7 @@ gdk_pixmap_new (GdkWindow *window, width, height, depth); private->width = width; private->height = height; + private->depth = depth; gdk_xid_table_insert (&GDK_DRAWABLE_XID (pixmap), pixmap); @@ -149,6 +149,7 @@ gdk_bitmap_create_from_data (GdkWindow *window, private->width = width; private->height = height; + private->depth = 1; GDK_DRAWABLE_XDATA (private)->xdisplay = GDK_DRAWABLE_XDISPLAY (window); GDK_DRAWABLE_XDATA (private)->xid = XCreateBitmapFromData (GDK_DRAWABLE_XDISPLAY (window), @@ -193,6 +194,7 @@ gdk_pixmap_create_from_data (GdkWindow *window, private->width = width; private->height = height; + private->depth = depth; GDK_DRAWABLE_XDATA (private)->xdisplay = GDK_DRAWABLE_XDISPLAY (window); GDK_DRAWABLE_XDATA (private)->xid = XCreatePixmapFromBitmapData (GDK_DRAWABLE_XDISPLAY (window), @@ -804,6 +806,7 @@ gdk_pixmap_foreign_new (guint32 anid) private->width = w_ret; private->height = h_ret; + private->depth = depth_ret; gdk_xid_table_insert(&GDK_DRAWABLE_XID (pixmap), pixmap); |