Changeset 38232 in webkit


Ignore:
Timestamp:
Nov 7, 2008 2:29:56 PM (15 years ago)
Author:
alp@webkit.org
Message:

2008-11-07 Alp Toker <​alp@nuanti.com>

Fix build with bleeding edge GTK+ versions. GTK+ and other libraries
now require that only their top-level header file is included.

Patch tested and still builds fine with older GTK+ versions (back to
2.8).

Future WebKit GTK+ contributions are required to adhere to this
policy.

  • platform/gtk/FileSystemGtk.cpp:
  • platform/gtk/KeyEventGtk.cpp:
  • platform/gtk/MouseEventGtk.cpp:
  • platform/gtk/WheelEventGtk.cpp:
  • platform/gtk/gtkdrawing.h:
  • plugins/gtk/gtk2xtbin.c:
  • plugins/gtk/gtk2xtbin.h:
Location:
trunk/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r38231 r38232  
     12008-11-07  Alp Toker  <alp@nuanti.com>
     2
     3        Fix build with bleeding edge GTK+ versions. GTK+ and other libraries
     4        now require that only their top-level header file is included.
     5
     6        Patch tested and still builds fine with older GTK+ versions (back to
     7        2.8).
     8
     9        Future WebKit GTK+ contributions are required to adhere to this
     10        policy.
     11
     12        * platform/gtk/FileSystemGtk.cpp:
     13        * platform/gtk/KeyEventGtk.cpp:
     14        * platform/gtk/MouseEventGtk.cpp:
     15        * platform/gtk/WheelEventGtk.cpp:
     16        * platform/gtk/gtkdrawing.h:
     17        * plugins/gtk/gtk2xtbin.c:
     18        * plugins/gtk/gtk2xtbin.h:
     19
    1202008-11-07  Anders Carlsson  <andersca@apple.com>
    221

  • trunk/WebCore/platform/gtk/FileSystemGtk.cpp

    r37610 r38232  
    3030#include <glib.h>
    3131#include <glib/gstdio.h>
    32 #include <glib/gutils.h>
    3332
    3433#include <unistd.h>

  • trunk/WebCore/platform/gtk/KeyEventGtk.cpp

    r37335 r38232  
    3737#include <gdk/gdk.h>
    3838#include <gdk/gdkkeysyms.h>
    39 #include <gtk/gtkversion.h>
     39
     40// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
     41#include <gtk/gtk.h>
    4042
    4143namespace WebCore {

  • trunk/WebCore/platform/gtk/MouseEventGtk.cpp

    r30404 r38232  
    3232
    3333#include <gdk/gdk.h>
    34 #include <gtk/gtkversion.h>
     34
     35// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
     36#include <gtk/gtk.h>
    3537
    3638namespace WebCore {

  • trunk/WebCore/platform/gtk/WheelEventGtk.cpp

    r37031 r38232  
    3030
    3131#include <gdk/gdk.h>
    32 #include <gtk/gtkversion.h>
     32
     33// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
     34#include <gtk/gtk.h>
    3335
    3436namespace WebCore {

  • trunk/WebCore/platform/gtk/gtkdrawing.h

    r36411 r38232  
    5050
    5151#include <gdk/gdk.h>
    52 #include <gtk/gtkstyle.h>
     52#include <gtk/gtk.h>
    5353
    5454#ifdef __cplusplus

  • trunk/WebCore/plugins/gtk/gtk2xtbin.c

    r37322 r38232  
    4747#include "xembed.h"
    4848#include "gtk2xtbin.h"
    49 #include <gtk/gtkmain.h>
    50 #include <gtk/gtkprivate.h>
     49#include <gtk/gtk.h>
    5150#include <gdk/gdkx.h>
    5251#include <glib.h>

  • trunk/WebCore/plugins/gtk/gtk2xtbin.h

    r37322 r38232  
    4141#define __GTK_XTBIN_H__
    4242
    43 #include <gtk/gtksocket.h>
     43#include <gtk/gtk.h>
    4444#include <X11/Intrinsic.h>
    4545#include <X11/Xutil.h>
Note: See TracChangeset for help on using the changeset viewer.