diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/platform/gtk/GtkVersioning.h | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/platform/gtk/GtkVersioning.h')
| -rw-r--r-- | Source/WebCore/platform/gtk/GtkVersioning.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebCore/platform/gtk/GtkVersioning.h b/Source/WebCore/platform/gtk/GtkVersioning.h index 11d1f8a..7e9fcd1 100644 --- a/Source/WebCore/platform/gtk/GtkVersioning.h +++ b/Source/WebCore/platform/gtk/GtkVersioning.h @@ -37,12 +37,14 @@ GdkPixbuf* gdk_pixbuf_get_from_surface(cairo_surface_t* surface, int srcX, int s int width, int height); #endif -#if !GTK_CHECK_VERSION(2, 24, 0) +#if !GTK_CHECK_VERSION(2, 23, 4) +#define gdk_pixmap_get_size gdk_drawable_get_size +#endif // GTK_CHECK_VERSION(2, 23, 4) + +#if !GTK_CHECK_VERSION(2, 23, 0) #define gdk_window_get_display(window) gdk_drawable_get_display(window) -#ifdef GDK_DISABLE_DEPRECATED #define gdk_window_get_visual gdk_drawable_get_visual -#endif -#endif // GTK_CHECK_VERSION(2, 24, 0) +#endif // GTK_CHECK_VERSION(2, 23, 0) #if !GTK_CHECK_VERSION(2, 21, 2) #define gdk_visual_get_depth(visual) (visual)->depth |