Added ifdef to compile with 0.9.24 removes creating a child GdkWindow

since it uses functionality only in directfb cvs

diff --git a/ChangeLog b/ChangeLog
index 6fc94d12d8d6357429664e6ded78107de9a45750..c3f6448021467bd15827060bf1b505653c7a7278 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-26  Michael Emmel  <mike.emmel@gmail.com>
+       
+       * 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  <kris@gtk.org>
 
        Make the insert and set functions somewhat more convenient.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6fc94d12d8d6357429664e6ded78107de9a45750..c3f6448021467bd15827060bf1b505653c7a7278 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-06-26  Michael Emmel  <mike.emmel@gmail.com>
+       
+       * 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  <kris@gtk.org>
 
        Make the insert and set functions somewhat more convenient.

diff --git a/gdk/directfb/gdkdirectfb.h b/gdk/directfb/gdkdirectfb.h
index 0db9ec917303eeb70675d5dd1d89a9866422109e..38008c220bc8191a74056c8c886131a46fe89523 100644 (file)
--- 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 e4d802eafa38b36d0de98e2140c75652597a0afc..3a24482c967af71e42cff0ac5b63d52a3de63dc4 100644 (file)
--- 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