diff options
| author | Attilio Fiandrotti <attilio@src.gnome.org> | 2007-05-20 22:00:15 +0000 |
|---|---|---|
| committer | Attilio Fiandrotti <attilio@src.gnome.org> | 2007-05-20 22:00:15 +0000 |
| commit | dd06ee943588588f008dbeb51ccad68d5ce908f6 (patch) | |
| tree | 4ca7708f4492fea7f0e3629614a3bbcc948fdc4c | |
| parent | 38a1ddb463e3cc186d7d08ac8685880b7190cff4 (diff) | |
| download | gdk-pixbuf-dd06ee943588588f008dbeb51ccad68d5ce908f6.tar.gz | |
Merged from trunk (r17879) fix for #437379
svn path=/branches/gtk-2-10/; revision=17880
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gdk/directfb/gdkdirectfb.h | 2 | ||||
| -rw-r--r-- | gdk/directfb/gdkwindow-directfb.c | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -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. diff --git a/gdk/directfb/gdkdirectfb.h b/gdk/directfb/gdkdirectfb.h index 05a2b8624..bf3480209 100644 --- a/gdk/directfb/gdkdirectfb.h +++ b/gdk/directfb/gdkdirectfb.h @@ -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 diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c index 951e2d683..c48064865 100644 --- a/gdk/directfb/gdkwindow-directfb.c +++ b/gdk/directfb/gdkwindow-directfb.c @@ -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) { |