Added ifdef to compile with 0.9.24 removes creating a child GdkWindow

since it uses functionality only in directfb cvs
This commit is contained in:
Michael David Emmel 2006-06-26 17:50:44 +00:00
parent 776ef101dd
commit 2c6564c875
4 changed files with 17 additions and 1 deletions

View File

@ -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> 2006-06-26 Kristian Rietveld <kris@gtk.org>
Make the insert and set functions somewhat more convenient. Make the insert and set functions somewhat more convenient.

View File

@ -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> 2006-06-26 Kristian Rietveld <kris@gtk.org>
Make the insert and set functions somewhat more convenient. Make the insert and set functions somewhat more convenient.

View File

@ -85,8 +85,12 @@ GdkVisual * gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format
IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window); IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window);
IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window); IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window);
#if (DIRECTFB_MICRO_VERSION > 24)
GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
IDirectFBSurface *subsurface); IDirectFBSurface *subsurface);
#endif
G_END_DECLS G_END_DECLS

View File

@ -2485,8 +2485,9 @@ gdk_window_get_frame_extents (GdkWindow *window,
/** /**
* Given a directfb window and a subsurface of that 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, GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
IDirectFBSurface *subsurface) IDirectFBSurface *subsurface)
{ {
@ -2532,6 +2533,7 @@ GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
return window; return window;
} }
#endif
/* /*
* The wrapping is not perfect since directfb does not give full access * The wrapping is not perfect since directfb does not give full access