From f1046d9a66b73647e858c8173d097b5bd418ab26 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 5 Dec 2000 11:39:26 +0000 Subject: Remove old debug g_warning(). (gdk_fb_draw_drawable): The src argument can 2000-12-05 Alexander Larsson * 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. --- gdk/linux-fb/gdkprivate-fb.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gdk/linux-fb/gdkprivate-fb.h') diff --git a/gdk/linux-fb/gdkprivate-fb.h b/gdk/linux-fb/gdkprivate-fb.h index 289a397520..5f830e7dfe 100644 --- a/gdk/linux-fb/gdkprivate-fb.h +++ b/gdk/linux-fb/gdkprivate-fb.h @@ -40,15 +40,18 @@ #include #include + +#define GDK_TYPE_DRAWABLE_IMPL_FBDATA (gdk_drawable_impl_fb_get_type ()) #define GDK_DRAWABLE_IMPL_FBDATA(win) ((GdkDrawableFBData *)((GdkWindowObject *)(win))->impl) -#define GDK_DRAWABLE_IMPL(win) ((GdkDrawable *)((GdkWindowObject *)(win))->impl) -#define GDK_WINDOW_IMPL_FBDATA(win) ((GdkWindowFBData *)((GdkWindowObject *)(win))->impl) -#define GDK_PIXMAP_IMPL_FBDATA(win) ((GdkPixmapFBData *)((GdkWindowObject *)(win))->impl) -#define GDK_DRAWABLE_FBDATA(win) ((GdkDrawableFBData *)(win)) -#define GDK_PIXMAP_FBDATA(win) ((GdkPixmapFBData *)(win)) -#define GDK_WINDOW_FBDATA(win) ((GdkWindowFBData *)(win)) -#define GDK_FONT_FB(f) ((GdkFontPrivateFB *)(f)) -#define GDK_CURSOR_FB(c) ((GdkCursorPrivateFB *)(c)) +#define GDK_IS_DRAWABLE_IMPL_FBDATA(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE_IMPL_FBDATA)) +#define GDK_DRAWABLE_IMPL(win) ((GdkDrawable *)((GdkWindowObject *)(win))->impl) +#define GDK_WINDOW_IMPL_FBDATA(win) ((GdkWindowFBData *)((GdkWindowObject *)(win))->impl) +#define GDK_PIXMAP_IMPL_FBDATA(win) ((GdkPixmapFBData *)((GdkWindowObject *)(win))->impl) +#define GDK_DRAWABLE_FBDATA(win) ((GdkDrawableFBData *)(win)) +#define GDK_PIXMAP_FBDATA(win) ((GdkPixmapFBData *)(win)) +#define GDK_WINDOW_FBDATA(win) ((GdkWindowFBData *)(win)) +#define GDK_FONT_FB(f) ((GdkFontPrivateFB *)(f)) +#define GDK_CURSOR_FB(c) ((GdkCursorPrivateFB *)(c)) #define GDK_CHECK_IMPL(drawable) \ g_assert(G_OBJECT_TYPE(drawable) == _gdk_window_impl_get_type() || G_OBJECT_TYPE(drawable) == _gdk_pixmap_impl_get_type()) -- cgit v1.2.1