Merged from trunk (r17879) fix for #437379

svn path=/branches/gtk-2-10/; revision=17880
This commit is contained in:
Attilio Fiandrotti
2007-05-20 22:00:15 +00:00
parent 38a1ddb463
commit dd06ee9435
3 changed files with 11 additions and 2 deletions

View File

@@ -1,3 +1,12 @@
2007-05-20 Attilio Fiandrotti <attilio.fiandrotti@gmail.com>
Merge from trunk:
* gdk/directfb/gdkwindow-directfb.c:
* gdk/directfb/gdkdirectfb.h: Updated minimum DirectFB version
required to enable gdk_directfb_create_child_window.
(Closes: #437379)
2007-05-18 Carlos Garnacho <carlos@imendio.com>
Refactor GtkFileChooserDialog sizing.

View File

@@ -86,7 +86,7 @@ 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 > 25)
#if (DIRECTFB_MAJOR_VERSION >= 1)
GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
IDirectFBSurface *subsurface);
#endif

View File

@@ -2506,7 +2506,7 @@ gdk_window_get_frame_extents (GdkWindow *window,
* Given a directfb window and a subsurface of that window
* create a gdkwindow child wrapper
*/
#if (DIRECTFB_MICRO_VERSION > 25)
#if (DIRECTFB_MAJOR_VERSION >= 1)
GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
IDirectFBSurface *subsurface)
{