diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-10-24 00:15:14 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-10-24 00:15:14 +0000 |
| commit | 86b5c82a97335ff7cd2edac3c1242d4c6b51e01b (patch) | |
| tree | 877343ed5fa893027913f4af76634c07b1d13683 /gdk/gdkpixmap.c | |
| parent | ce821b23f5f719081c6c6db8120408c0158160d5 (diff) | |
| download | gtk+-86b5c82a97335ff7cd2edac3c1242d4c6b51e01b.tar.gz | |
Re-enable the "find" dialog
2000-10-23 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Re-enable the "find" dialog
* gtk/testgtk.c: Add test for gdk_drawable_get_image
* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix bug where
the arguments to gdk_draw_drawable were in the wrong order
(gdk_window_paint_init_bg): This function was ignoring the
init_region, instead of clipping to it, so the entire backing
pixmap was cleared on every begin_paint()
(gdk_window_begin_paint_region): Hmm, the same list-walking bug
was in here again, the loop kept using the same GtkWindowPaint
over and over.
(gdk_window_begin_paint_region): Fix a bug where we had two
x_offset instead of x_offset and y_offset
* gdk/gdkdraw.c (gdk_drawable_get_image): get composite drawable
before we get the image.
(gdk_draw_drawable): get the composite before we draw the drawable.
(gdk_drawable_real_get_composite_drawable): default
get_composite_drawable implementation that returns the drawable
itself
* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Add
get_composite_drawable virtual function
* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix a cheesy
list-walking bug
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_drawable): Add a hack to
make this work if the source drawable is a GdkDrawableImplX11
instead of a public drawable type. This is really broken; the
problem is that GdkDrawable needs a virtual method get_xid(), but
of course that doesn't work in practice. Enter RTTI.
Also, improve mismatched depth message.
* gdk/gdkpixmap.c (gdk_pixmap_get_image): Implement get_image for
GdkPixmap
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_class_init):
install _gdk_x11_get_image as our implementation of get_image
* gdk/x11/gdkimage-x11.c (gdk_image_get): Rename to
_gdk_x11_get_image and export for use in gdkdrawable-x11.c
* gdk/gdkimage.c (gdk_image_get): Make this just a wrapper around
gdk_drawable_get_image
* gdk/gdkdraw.c (gdk_drawable_get_image): call virtual get_image
* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Virtualize
get_image
* gtk/gtktreestore.c (gtk_tree_store_get_node): remove weird
trailing semicolon after for loop
Diffstat (limited to 'gdk/gdkpixmap.c')
| -rw-r--r-- | gdk/gdkpixmap.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 2a318651fd..8b44d87287 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -107,6 +107,13 @@ static void gdk_pixmap_real_get_size (GdkDrawable *drawable, gint *width, gint *height); +static GdkImage* gdk_pixmap_get_image (GdkDrawable *drawable, + gint x, + gint y, + gint width, + gint height); + + static GdkVisual* gdk_pixmap_real_get_visual (GdkDrawable *drawable); static gint gdk_pixmap_real_get_depth (GdkDrawable *drawable); static void gdk_pixmap_real_set_colormap (GdkDrawable *drawable, @@ -181,6 +188,7 @@ gdk_pixmap_class_init (GdkPixmapObjectClass *klass) drawable_class->set_colormap = gdk_pixmap_real_set_colormap; drawable_class->get_colormap = gdk_pixmap_real_get_colormap; drawable_class->get_visual = gdk_pixmap_real_get_visual; + drawable_class->get_image = gdk_pixmap_get_image; } static void @@ -410,6 +418,19 @@ gdk_pixmap_real_get_colormap (GdkDrawable *drawable) return gdk_drawable_get_colormap (((GdkPixmapObject*)drawable)->impl); } +static GdkImage* +gdk_pixmap_get_image (GdkDrawable *drawable, + gint x, + gint y, + gint width, + gint height) +{ + g_return_val_if_fail (GDK_IS_PIXMAP (drawable), NULL); + + return gdk_drawable_get_image (((GdkPixmapObject*)drawable)->impl, + x, y, width, height); +} + #define PACKED_COLOR(c) ((((c)->red & 0xff) << 8) | ((c)->green & 0xff) | ((c)->blue >> 8)) static GdkPixmap * |