diff options
| author | Alexander Larsson <alla@lysator.liu.se> | 2000-12-05 11:39:26 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2000-12-05 11:39:26 +0000 |
| commit | f1046d9a66b73647e858c8173d097b5bd418ab26 (patch) | |
| tree | 88bade77af10e1e02cf16764281deb3ea68063d8 /gdk/linux-fb/gdkdrawable-fb2.c | |
| parent | b7118c80947350be5221122102273834c290943b (diff) | |
| download | gtk+-f1046d9a66b73647e858c8173d097b5bd418ab26.tar.gz | |
Remove old debug g_warning(). (gdk_fb_draw_drawable): The src argument can
2000-12-05 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_draw_drawable_3):
Remove old debug g_warning().
(gdk_fb_draw_drawable): The src argument can be either a wrapper
or an implementation, just pass the implementation to draw_drawable_2.
* gdk/linux-fb/gdkprivate-fb.h:
Added GDK_IS_DRAWABLE_IMPL_FBDATA()
* gdk/linux-fb/gdkwindow-fb.c (_gdk_windowing_window_destroy):
clear and invalidate area when window is destroyed.
(send_map_events): Remove old commented out code.
Diffstat (limited to 'gdk/linux-fb/gdkdrawable-fb2.c')
| -rw-r--r-- | gdk/linux-fb/gdkdrawable-fb2.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c index e184c6a67b..94a1c7874d 100644 --- a/gdk/linux-fb/gdkdrawable-fb2.c +++ b/gdk/linux-fb/gdkdrawable-fb2.c @@ -558,10 +558,6 @@ gdk_fb_draw_drawable_3 (GdkDrawable *drawable, case 78: draw_func = gc_private->draw_drawable[GDK_FB_SRC_BPP_8_AA_GRAYVAL]; break; - case 0: - g_warning ("gdk_fb_draw_drawable_3() - source drawable with zero depth, ignoring\n"); - return; - break; default: g_assert_not_reached (); break; @@ -623,7 +619,15 @@ gdk_fb_draw_drawable (GdkDrawable *drawable, gint width, gint height) { - gdk_fb_draw_drawable_2 (drawable, gc, GDK_DRAWABLE_IMPL (src), xsrc, ysrc, xdest, ydest, width, height, TRUE, TRUE); + GdkPixmap *src_impl; + + if (GDK_IS_DRAWABLE_IMPL_FBDATA (src)) + src_impl = src; + else + src_impl = GDK_DRAWABLE_IMPL (src); + + + gdk_fb_draw_drawable_2 (drawable, gc, src_impl , xsrc, ysrc, xdest, ydest, width, height, TRUE, TRUE); } |