From 2c6564c87506d9903ddff3020593dc40d1586d75 Mon Sep 17 00:00:00 2001 From: Michael David Emmel Date: Mon, 26 Jun 2006 17:50:44 +0000 Subject: [PATCH] Added ifdef to compile with 0.9.24 removes creating a child GdkWindow since it uses functionality only in directfb cvs --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gdk/directfb/gdkdirectfb.h | 4 ++++ gdk/directfb/gdkwindow-directfb.c | 4 +++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6fc94d12d8..c3f6448021 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-26 Michael Emmel + + * gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24 + * gdk/directfb/gdkwindow-directfb.c: ifdef depend on directfb cvs + 2006-06-26 Kristian Rietveld Make the insert and set functions somewhat more convenient. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6fc94d12d8..c3f6448021 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-06-26 Michael Emmel + + * gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24 + * gdk/directfb/gdkwindow-directfb.c: ifdef depend on directfb cvs + 2006-06-26 Kristian Rietveld Make the insert and set functions somewhat more convenient. diff --git a/gdk/directfb/gdkdirectfb.h b/gdk/directfb/gdkdirectfb.h index 0db9ec9173..38008c220b 100644 --- a/gdk/directfb/gdkdirectfb.h +++ b/gdk/directfb/gdkdirectfb.h @@ -85,8 +85,12 @@ GdkVisual * gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window); IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window); + +#if (DIRECTFB_MICRO_VERSION > 24) GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, IDirectFBSurface *subsurface); +#endif + G_END_DECLS diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c index e4d802eafa..3a24482c96 100644 --- a/gdk/directfb/gdkwindow-directfb.c +++ b/gdk/directfb/gdkwindow-directfb.c @@ -2485,8 +2485,9 @@ gdk_window_get_frame_extents (GdkWindow *window, /** * Given a directfb window and a subsurface of that window - * create a gdkwindow chaild wrapper + * create a gdkwindow child wrapper */ +#if (DIRECTFB_MICRO_VERSION > 24) GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, IDirectFBSurface *subsurface) { @@ -2532,6 +2533,7 @@ GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, return window; } +#endif /* * The wrapping is not perfect since directfb does not give full access