Changeset 152552 in webkit


Ignore:
Timestamp:
Jul 10, 2013 3:39:03 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Fix build against GTK+ 2.0
https://bugs.webkit.org/show_bug.cgi?id=117895

Patch by Dominique Leuenberger <dimstar@opensuse.org> on 2013-07-10
Reviewed by Martin Robinson.

GTK2 build fails for undefined GDK_IS_X11_DISPLAY
GTK 2.0 does define GDK_WINDOWING_X11,but GDK_IS_X11_DISPLAY is not
present in GTK+ 2.0. A dummy defines is sufficient, as GTK 2.0 is not
that multiple backend aware anyway...

  • platform/gtk/GtkVersioning.h: Define GDK_IS_X11_DISPLAY for GTK+ 2.0 and compatibility for gtk_widget_get_preferred_size()
  • plugins/gtk/gtk2xtbin.c: Include config.h
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r152548 r152552  
     12013-07-10  Dominique Leuenberger  <dimstar@opensuse.org>
     2
     3        Fix build against GTK+ 2.0
     4        https://bugs.webkit.org/show_bug.cgi?id=117895
     5
     6        Reviewed by Martin Robinson.
     7
     8        GTK2 build fails for undefined GDK_IS_X11_DISPLAY
     9        GTK 2.0 does define GDK_WINDOWING_X11,but GDK_IS_X11_DISPLAY is not
     10        present in GTK+ 2.0. A dummy defines is sufficient, as GTK 2.0 is not
     11        that multiple backend aware anyway...
     12
     13        * platform/gtk/GtkVersioning.h: Define GDK_IS_X11_DISPLAY for GTK+ 2.0
     14          and compatibility for gtk_widget_get_preferred_size()
     15        * plugins/gtk/gtk2xtbin.c: Include config.h
     16
    1172013-07-10  Tim Horton  <timothy_horton@apple.com>
    218
  • trunk/Source/WebCore/platform/gtk/GtkVersioning.h

    r150189 r152552  
    4141GdkDevice* getDefaultGDKPointerDevice(GdkWindow* window);
    4242
     43// gtk_widget_get_preferred_size() appeared only in GTK 3.0.
     44#if !GTK_CHECK_VERSION (2, 91, 0)  // gtk_widget_get_preferred_size appeared about then.
     45#define gtk_widget_get_preferred_size(widget, minimumSize, naturalSize) \
     46        (gtk_widget_size_request((widget), ((minimumSize))))
     47#endif
     48
     49// Define GDK_IS_X11_DISPLAY dummy for GTK+ 2.0 compatibility.
     50#ifndef GDK_IS_X11_DISPLAY
     51  #ifdef GDK_WINDOWING_X11
     52    #define GDK_IS_X11_DISPLAY(display) 1
     53  #else
     54    #define GDK_IS_X11_DISPLAY(display) 0
     55  #endif
     56#endif
     57
    4358G_END_DECLS
    4459
  • trunk/Source/WebCore/plugins/gtk/gtk2xtbin.c

    r149952 r152552  
    4343 */
    4444
     45#include "config.h"
    4546#include "GtkVersioning.h"
    4647#include "xembed.h"
Note: See TracChangeset for help on using the changeset viewer.