/:

2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>

        Rubber stamped by Adam.

        Renamed files from *Gdk to *Gtk (see #14732) using the
        work of Juan A. Suarez Romero as a base.

        GDK -> GTK

        * WebKit.pri:
        * WebKit.pro:

JavaScriptCore:
2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>

        Rubber stamped by Adam.

        Renamed files from *Gdk to *Gtk (see #14732) using the
        work of Juan A. Suarez Romero as a base.

        GDK -> GTK

        * JavaScriptCore.pri:
        * kjs/testkjs.pro:
        * pcre/dftables.pro:
        * wtf/Platform.h: PLATFORM(GDK) to PLATFORM(GTK)

WebCore:
2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>

        Rubber stamped by Adam.

        Renamed files from *Gdk to *Gtk (see #14732) using the
        work of Juan A. Suarez Romero as a base.

        GDK -> GTK

        * Projects/gdk/webcore-gdk.bkl:
        * WebCore.pro:
        * WebCoreSources.bkl:
        * loader/gdk: Removed.
        * loader/gdk/DocumentLoaderGdk.cpp: Removed.
        * loader/gtk: Added.
        * loader/gtk/DocumentLoaderGdk.cpp: Removed.
        * loader/gtk/DocumentLoaderGtk.cpp: Added.
        * page/FrameView.cpp:
        * page/FrameView.h:
        * page/gdk: Removed.
        * page/gdk/DragControllerGdk.cpp: Removed.
        * page/gdk/EventHandlerGdk.cpp: Removed.
        * page/gdk/FrameGdk.cpp: Removed.
        * page/gtk: Added.
        * page/gtk/DragControllerGdk.cpp: Removed.
        * page/gtk/DragControllerGtk.cpp: Added.
        * page/gtk/EventHandlerGdk.cpp: Removed.
        * page/gtk/EventHandlerGtk.cpp: Added.
        (WebCore::EventHandler::createDraggingClipboard):
        * page/gtk/FrameGdk.cpp: Removed.
        * page/gtk/FrameGtk.cpp: Added.
        * platform/ContextMenuItem.h:
        * platform/Cursor.h:
        * platform/DragData.h:
        * platform/DragImage.h:
        * platform/FontData.h:
        * platform/NotImplemented.h:
        * platform/PlatformKeyboardEvent.h:
        * platform/PlatformMenuDescription.h:
        * platform/PlatformMouseEvent.h:
        * platform/PlatformWheelEvent.h:
        * platform/ScrollView.h:
        * platform/Widget.h:
        * platform/gdk: Removed.
        * platform/gdk/ClipboardGdk.cpp: Removed.
        * platform/gdk/ClipboardGdk.h: Removed.
        * platform/gdk/ContextMenuGdk.cpp: Removed.
        * platform/gdk/ContextMenuItemGdk.cpp: Removed.
        * platform/gdk/CookieJarGdk.cpp: Removed.
        * platform/gdk/CursorGdk.cpp: Removed.
        * platform/gdk/DragDataGdk.cpp: Removed.
        * platform/gdk/DragImageGdk.cpp: Removed.
        * platform/gdk/FileChooserGdk.cpp: Removed.
        * platform/gdk/FileSystemGdk.cpp: Removed.
        * platform/gdk/FontCacheGdk.cpp: Removed.
        * platform/gdk/FontDataGdk.cpp: Removed.
        * platform/gdk/FontGdk.cpp: Removed.
        * platform/gdk/FontPlatformData.h: Removed.
        * platform/gdk/FontPlatformDataGdk.cpp: Removed.
        * platform/gdk/GlyphPageTreeNodeGdk.cpp: Removed.
        * platform/gdk/KeyEventGdk.cpp: Removed.
        * platform/gdk/KeyboardCodes.h: Removed.
        * platform/gdk/LocalizedStringsGdk.cpp: Removed.
        * platform/gdk/LoggingGdk.cpp: Removed.
        * platform/gdk/MIMETypeRegistryGdk.cpp: Removed.
        * platform/gdk/MouseEventGdk.cpp: Removed.
        * platform/gdk/PasteboardGdk.cpp: Removed.
        * platform/gdk/PlatformScreenGdk.cpp: Removed.
        * platform/gdk/PlatformScrollBar.h: Removed.
        * platform/gdk/PlatformScrollBarGdk.cpp: Removed.
        * platform/gdk/PopupMenuGdk.cpp: Removed.
        * platform/gdk/RenderThemeGdk.cpp: Removed.
        * platform/gdk/RenderThemeGdk.h: Removed.
        * platform/gdk/ScrollViewGdk.cpp: Removed.
        * platform/gdk/SearchPopupMenuGdk.cpp: Removed.
        * platform/gdk/SharedTimerLinux.cpp: Removed.
        * platform/gdk/SoundGdk.cpp: Removed.
        * platform/gdk/SystemTimeLinux.cpp: Removed.
        * platform/gdk/TemporaryLinkStubs.cpp: Removed.
        * platform/gdk/WheelEventGdk.cpp: Removed.
        * platform/gdk/WidgetGdk.cpp: Removed.
        * platform/graphics/GraphicsContext.h:
        * platform/graphics/cairo/GraphicsContextCairo.cpp:
        (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
        (WebCore::GraphicsContext::setPlatformFont):
        * platform/graphics/gdk: Removed.
        * platform/graphics/gdk/IconGdk.cpp: Removed.
        * platform/graphics/gdk/ImageGdk.cpp: Removed.
        * platform/graphics/gtk: Added.
        * platform/graphics/gtk/IconGdk.cpp: Removed.
        * platform/graphics/gtk/IconGtk.cpp: Added.
        * platform/graphics/gtk/ImageGdk.cpp: Removed.
        * platform/graphics/gtk/ImageGtk.cpp: Added.
        * platform/gtk: Added.
        * platform/gtk/ClipboardGdk.cpp: Removed.
        * platform/gtk/ClipboardGdk.h: Removed.
        * platform/gtk/ClipboardGtk.cpp: Added.
        (WebCore::ClipboardGtk::ClipboardGtk):
        (WebCore::ClipboardGtk::~ClipboardGtk):
        (WebCore::ClipboardGtk::clearData):
        (WebCore::ClipboardGtk::clearAllData):
        (WebCore::ClipboardGtk::getData):
        (WebCore::ClipboardGtk::setData):
        (WebCore::ClipboardGtk::types):
        (WebCore::ClipboardGtk::dragLocation):
        (WebCore::ClipboardGtk::dragImage):
        (WebCore::ClipboardGtk::setDragImage):
        (WebCore::ClipboardGtk::dragImageElement):
        (WebCore::ClipboardGtk::setDragImageElement):
        (WebCore::ClipboardGtk::createDragImage):
        (WebCore::ClipboardGtk::declareAndWriteDragImage):
        (WebCore::ClipboardGtk::writeURL):
        (WebCore::ClipboardGtk::writeRange):
        (WebCore::ClipboardGtk::hasData):
        * platform/gtk/ClipboardGtk.h: Added.
        * platform/gtk/ContextMenuGdk.cpp: Removed.
        * platform/gtk/ContextMenuGtk.cpp: Added.
        * platform/gtk/ContextMenuItemGdk.cpp: Removed.
        * platform/gtk/ContextMenuItemGtk.cpp: Added.
        * platform/gtk/CookieJarGdk.cpp: Removed.
        * platform/gtk/CookieJarGtk.cpp: Added.
        * platform/gtk/CursorGdk.cpp: Removed.
        * platform/gtk/CursorGtk.cpp: Added.
        * platform/gtk/DragDataGdk.cpp: Removed.
        * platform/gtk/DragDataGtk.cpp: Added.
        * platform/gtk/DragImageGdk.cpp: Removed.
        * platform/gtk/DragImageGtk.cpp: Added.
        * platform/gtk/FileChooserGdk.cpp: Removed.
        * platform/gtk/FileChooserGtk.cpp: Added.
        * platform/gtk/FileSystemGdk.cpp: Removed.
        * platform/gtk/FileSystemGtk.cpp: Added.
        * platform/gtk/FontCacheGdk.cpp: Removed.
        * platform/gtk/FontCacheGtk.cpp: Added.
        * platform/gtk/FontDataGdk.cpp: Removed.
        * platform/gtk/FontDataGtk.cpp: Added.
        * platform/gtk/FontGdk.cpp: Removed.
        * platform/gtk/FontGtk.cpp: Added.
        * platform/gtk/FontPlatformDataGdk.cpp: Removed.
        * platform/gtk/FontPlatformDataGtk.cpp: Added.
        * platform/gtk/GlyphPageTreeNodeGdk.cpp: Removed.
        * platform/gtk/GlyphPageTreeNodeGtk.cpp: Added.
        * platform/gtk/KeyEventGdk.cpp: Removed.
        * platform/gtk/KeyEventGtk.cpp: Added.
        * platform/gtk/LocalizedStringsGdk.cpp: Removed.
        * platform/gtk/LocalizedStringsGtk.cpp: Added.
        * platform/gtk/LoggingGdk.cpp: Removed.
        * platform/gtk/LoggingGtk.cpp: Added.
        * platform/gtk/MIMETypeRegistryGdk.cpp: Removed.
        * platform/gtk/MIMETypeRegistryGtk.cpp: Added.
        * platform/gtk/MouseEventGdk.cpp: Removed.
        * platform/gtk/MouseEventGtk.cpp: Added.
        * platform/gtk/PasteboardGdk.cpp: Removed.
        * platform/gtk/PasteboardGtk.cpp: Added.
        * platform/gtk/PlatformScreenGdk.cpp: Removed.
        * platform/gtk/PlatformScreenGtk.cpp: Added.
        * platform/gtk/PlatformScrollBarGdk.cpp: Removed.
        * platform/gtk/PlatformScrollBarGtk.cpp: Added.
        * platform/gtk/PopupMenuGdk.cpp: Removed.
        * platform/gtk/PopupMenuGtk.cpp: Added.
        * platform/gtk/RenderThemeGdk.cpp: Removed.
        * platform/gtk/RenderThemeGdk.h: Removed.
        * platform/gtk/RenderThemeGtk.cpp: Added.
        (WebCore::theme):
        (WebCore::RenderThemeGtk::RenderThemeGtk):
        (WebCore::RenderThemeGtk::close):
        (WebCore::RenderThemeGtk::addIntrinsicMargins):
        (WebCore::RenderThemeGtk::supportsFocus):
        (WebCore::RenderThemeGtk::determineState):
        (WebCore::RenderThemeGtk::determineShadow):
        (WebCore::RenderThemeGtk::getThemeData):
        (WebCore::RenderThemeGtk::setCheckboxSize):
        (WebCore::RenderThemeGtk::paintCheckbox):
        (WebCore::RenderThemeGtk::setRadioSize):
        (WebCore::RenderThemeGtk::paintRadio):
        (WebCore::RenderThemeGtk::paintButton):
        (WebCore::RenderThemeGtk::adjustTextFieldStyle):
        (WebCore::RenderThemeGtk::paintTextField):
        (WebCore::RenderThemeGtk::paintTextArea):
        (WebCore::RenderThemeGtk::adjustButtonStyle):
        (WebCore::RenderThemeGtk::systemFont):
        (WebCore::RenderThemeGtk::gtkButton):
        (WebCore::RenderThemeGtk::gtkCheckbox):
        (WebCore::RenderThemeGtk::gtkRadioButton):
        (WebCore::RenderThemeGtk::gtkWindowContainer):
        * platform/gtk/RenderThemeGtk.h: Added.
        * platform/gtk/ScrollViewGdk.cpp: Removed.
        * platform/gtk/ScrollViewGtk.cpp: Added.
        * platform/gtk/SearchPopupMenuGdk.cpp: Removed.
        * platform/gtk/SearchPopupMenuGtk.cpp: Added.
        * platform/gtk/SoundGdk.cpp: Removed.
        * platform/gtk/SoundGtk.cpp: Added.
        * platform/gtk/WheelEventGdk.cpp: Removed.
        * platform/gtk/WheelEventGtk.cpp: Added.
        * platform/gtk/WidgetGdk.cpp: Removed.
        * platform/gtk/WidgetGtk.cpp: Added.
        * platform/network/ResourceHandle.h:

WebKitTools:
2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>

        Rubber stamped by Adam.

        * GdkLauncher: Removed.
        * GdkLauncher/Bakefiles.bkgen: Removed.
        * GdkLauncher/ENV: Removed.
        * GdkLauncher/GdkLauncher.pro: Removed.
        * GdkLauncher/gdklauncher.bkl: Removed.
        * GdkLauncher/main.cpp: Removed.
        * GdkLauncher/mk: Removed.
        * GdkLauncher/simple.svg: Removed.
        * GdkLauncher/text.html: Removed.
        * GtkLauncher: Added.
        * GtkLauncher/GdkLauncher.pro: Removed.
        * GtkLauncher/GtkLauncher.pro: Added.
        * GtkLauncher/main.cpp:
        (updateWindowTitle):
        (main):
        * Scripts/build-webkit:
        * Scripts/regenerate-makefiles:
        * Scripts/run-javascriptcore-tests:
        * Scripts/run-launcher:
        * Scripts/run-webkit-tests:
        * Scripts/webkitdirs.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25703 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3edb879..a05be8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Rubber stamped by Adam.
+
+        Renamed files from *Gdk to *Gtk (see #14732) using the
+        work of Juan A. Suarez Romero as a base.
+
+        GDK -> GTK
+
+        * WebKit.pri:
+        * WebKit.pro:
+
 2007-07-29  Brian Mastenbrook  <brian@mastenbrook.net>
 
         Build fix for WebKit/Gtk to compile on Fedora 7 as described in

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 92036db..67aff33 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Rubber stamped by Adam.
+
+        Renamed files from *Gdk to *Gtk (see #14732) using the
+        work of Juan A. Suarez Romero as a base.
+
+        GDK -> GTK 
+
+        * JavaScriptCore.pri:
+        * kjs/testkjs.pro:
+        * pcre/dftables.pro:
+        * wtf/Platform.h: PLATFORM(GDK) to PLATFORM(GTK)
+
 2007-09-21  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Antti Koivisto.

diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 084ba1b..f627f5c 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -6,7 +6,7 @@ INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/bindings $$PWD/bindings/c $$PWD/wtf
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
 qt-port:INCLUDEPATH += $$PWD/bindings/qt
 qt-port:DEFINES += BUILDING_QT__
-gdk-port:DEFINES += BUILDING_GDK__
+gtk-port:DEFINES += BUILDING_GTK__
 
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
 
@@ -26,7 +26,7 @@ KEYWORDLUT_FILES += \
 KJSBISON += \
     kjs/grammar.y
 
-gdk-port: SOURCES += wtf/TCSystemAlloc.cpp
+gtk-port: SOURCES += wtf/TCSystemAlloc.cpp
 
 SOURCES += \
     wtf/Assertions.cpp \

diff --git a/JavaScriptCore/kjs/testkjs.pro b/JavaScriptCore/kjs/testkjs.pro
index dc3fd4e..d7caefe 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.pro
+++ b/JavaScriptCore/kjs/testkjs.pro
@@ -7,7 +7,7 @@ DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS
 INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
 qt-port:DEFINES += BUILDING_QT__
 #qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
-gdk-port {
+gtk-port {
     QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
     LIBS += $$system(icu-config --ldflags)
 }

diff --git a/JavaScriptCore/pcre/dftables.pro b/JavaScriptCore/pcre/dftables.pro
index 07940f9..234dc64 100644 (file)
--- a/JavaScriptCore/pcre/dftables.pro
+++ b/JavaScriptCore/pcre/dftables.pro
@@ -7,8 +7,8 @@ DESTDIR = tmp
 
 INCLUDEPATH += $$PWD/../wtf
 
-gdk-port {
-  DEFINES += BUILDING_GDK__ BUILDING_CAIRO__
+gtk-port {
+  DEFINES += BUILDING_GTK__ BUILDING_CAIRO__
 } else {
   DEFINES += BUILDING_QT__
 }

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 3bf5374..3964093 100644 (file)
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -66,7 +66,7 @@
 /* Operating environments */
 
 /* PLATFORM(QT) */
-/* PLATFORM(GDK) */
+/* PLATFORM(GTK) */
 /* PLATFORM(MAC) */
 /* PLATFORM(WIN) */
 #if defined(BUILDING_QT__)
@@ -77,8 +77,8 @@
 #define WTF_PLATFORM_KDE 1
 #endif
 
-#elif defined(BUILDING_GDK__)
-#define WTF_PLATFORM_GDK 1
+#elif defined(BUILDING_GTK__)
+#define WTF_PLATFORM_GTK 1
 #elif PLATFORM(DARWIN)
 #define WTF_PLATFORM_MAC 1
 #elif PLATFORM(WIN_OS)
@@ -201,7 +201,7 @@
 #define WTF_USE_WININET 1
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 #define WTF_USE_CURL 1
 #endif
 

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 58e274b..3388d59 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,200 @@
+2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Rubber stamped by Adam.
+
+        Renamed files from *Gdk to *Gtk (see #14732) using the
+        work of Juan A. Suarez Romero as a base.
+
+        GDK -> GTK
+
+        * Projects/gdk/webcore-gdk.bkl:
+        * WebCore.pro:
+        * WebCoreSources.bkl:
+        * loader/gdk: Removed.
+        * loader/gdk/DocumentLoaderGdk.cpp: Removed.
+        * loader/gtk: Added.
+        * loader/gtk/DocumentLoaderGdk.cpp: Removed.
+        * loader/gtk/DocumentLoaderGtk.cpp: Added.
+        * page/FrameView.cpp:
+        * page/FrameView.h:
+        * page/gdk: Removed.
+        * page/gdk/DragControllerGdk.cpp: Removed.
+        * page/gdk/EventHandlerGdk.cpp: Removed.
+        * page/gdk/FrameGdk.cpp: Removed.
+        * page/gtk: Added.
+        * page/gtk/DragControllerGdk.cpp: Removed.
+        * page/gtk/DragControllerGtk.cpp: Added.
+        * page/gtk/EventHandlerGdk.cpp: Removed.
+        * page/gtk/EventHandlerGtk.cpp: Added.
+        (WebCore::EventHandler::createDraggingClipboard):
+        * page/gtk/FrameGdk.cpp: Removed.
+        * page/gtk/FrameGtk.cpp: Added.
+        * platform/ContextMenuItem.h:
+        * platform/Cursor.h:
+        * platform/DragData.h:
+        * platform/DragImage.h:
+        * platform/FontData.h:
+        * platform/NotImplemented.h:
+        * platform/PlatformKeyboardEvent.h:
+        * platform/PlatformMenuDescription.h:
+        * platform/PlatformMouseEvent.h:
+        * platform/PlatformWheelEvent.h:
+        * platform/ScrollView.h:
+        * platform/Widget.h:
+        * platform/gdk: Removed.
+        * platform/gdk/ClipboardGdk.cpp: Removed.
+        * platform/gdk/ClipboardGdk.h: Removed.
+        * platform/gdk/ContextMenuGdk.cpp: Removed.
+        * platform/gdk/ContextMenuItemGdk.cpp: Removed.
+        * platform/gdk/CookieJarGdk.cpp: Removed.
+        * platform/gdk/CursorGdk.cpp: Removed.
+        * platform/gdk/DragDataGdk.cpp: Removed.
+        * platform/gdk/DragImageGdk.cpp: Removed.
+        * platform/gdk/FileChooserGdk.cpp: Removed.
+        * platform/gdk/FileSystemGdk.cpp: Removed.
+        * platform/gdk/FontCacheGdk.cpp: Removed.
+        * platform/gdk/FontDataGdk.cpp: Removed.
+        * platform/gdk/FontGdk.cpp: Removed.
+        * platform/gdk/FontPlatformData.h: Removed.
+        * platform/gdk/FontPlatformDataGdk.cpp: Removed.
+        * platform/gdk/GlyphPageTreeNodeGdk.cpp: Removed.
+        * platform/gdk/KeyEventGdk.cpp: Removed.
+        * platform/gdk/KeyboardCodes.h: Removed.
+        * platform/gdk/LocalizedStringsGdk.cpp: Removed.
+        * platform/gdk/LoggingGdk.cpp: Removed.
+        * platform/gdk/MIMETypeRegistryGdk.cpp: Removed.
+        * platform/gdk/MouseEventGdk.cpp: Removed.
+        * platform/gdk/PasteboardGdk.cpp: Removed.
+        * platform/gdk/PlatformScreenGdk.cpp: Removed.
+        * platform/gdk/PlatformScrollBar.h: Removed.
+        * platform/gdk/PlatformScrollBarGdk.cpp: Removed.
+        * platform/gdk/PopupMenuGdk.cpp: Removed.
+        * platform/gdk/RenderThemeGdk.cpp: Removed.
+        * platform/gdk/RenderThemeGdk.h: Removed.
+        * platform/gdk/ScrollViewGdk.cpp: Removed.
+        * platform/gdk/SearchPopupMenuGdk.cpp: Removed.
+        * platform/gdk/SharedTimerLinux.cpp: Removed.
+        * platform/gdk/SoundGdk.cpp: Removed.
+        * platform/gdk/SystemTimeLinux.cpp: Removed.
+        * platform/gdk/TemporaryLinkStubs.cpp: Removed.
+        * platform/gdk/WheelEventGdk.cpp: Removed.
+        * platform/gdk/WidgetGdk.cpp: Removed.
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
+        (WebCore::GraphicsContext::setPlatformFont):
+        * platform/graphics/gdk: Removed.
+        * platform/graphics/gdk/IconGdk.cpp: Removed.
+        * platform/graphics/gdk/ImageGdk.cpp: Removed.
+        * platform/graphics/gtk: Added.
+        * platform/graphics/gtk/IconGdk.cpp: Removed.
+        * platform/graphics/gtk/IconGtk.cpp: Added.
+        * platform/graphics/gtk/ImageGdk.cpp: Removed.
+        * platform/graphics/gtk/ImageGtk.cpp: Added.
+        * platform/gtk: Added.
+        * platform/gtk/ClipboardGdk.cpp: Removed.
+        * platform/gtk/ClipboardGdk.h: Removed.
+        * platform/gtk/ClipboardGtk.cpp: Added.
+        (WebCore::ClipboardGtk::ClipboardGtk):
+        (WebCore::ClipboardGtk::~ClipboardGtk):
+        (WebCore::ClipboardGtk::clearData):
+        (WebCore::ClipboardGtk::clearAllData):
+        (WebCore::ClipboardGtk::getData):
+        (WebCore::ClipboardGtk::setData):
+        (WebCore::ClipboardGtk::types):
+        (WebCore::ClipboardGtk::dragLocation):
+        (WebCore::ClipboardGtk::dragImage):
+        (WebCore::ClipboardGtk::setDragImage):
+        (WebCore::ClipboardGtk::dragImageElement):
+        (WebCore::ClipboardGtk::setDragImageElement):
+        (WebCore::ClipboardGtk::createDragImage):
+        (WebCore::ClipboardGtk::declareAndWriteDragImage):
+        (WebCore::ClipboardGtk::writeURL):
+        (WebCore::ClipboardGtk::writeRange):
+        (WebCore::ClipboardGtk::hasData):
+        * platform/gtk/ClipboardGtk.h: Added.
+        * platform/gtk/ContextMenuGdk.cpp: Removed.
+        * platform/gtk/ContextMenuGtk.cpp: Added.
+        * platform/gtk/ContextMenuItemGdk.cpp: Removed.
+        * platform/gtk/ContextMenuItemGtk.cpp: Added.
+        * platform/gtk/CookieJarGdk.cpp: Removed.
+        * platform/gtk/CookieJarGtk.cpp: Added.
+        * platform/gtk/CursorGdk.cpp: Removed.
+        * platform/gtk/CursorGtk.cpp: Added.
+        * platform/gtk/DragDataGdk.cpp: Removed.
+        * platform/gtk/DragDataGtk.cpp: Added.
+        * platform/gtk/DragImageGdk.cpp: Removed.
+        * platform/gtk/DragImageGtk.cpp: Added.
+        * platform/gtk/FileChooserGdk.cpp: Removed.
+        * platform/gtk/FileChooserGtk.cpp: Added.
+        * platform/gtk/FileSystemGdk.cpp: Removed.
+        * platform/gtk/FileSystemGtk.cpp: Added.
+        * platform/gtk/FontCacheGdk.cpp: Removed.
+        * platform/gtk/FontCacheGtk.cpp: Added.
+        * platform/gtk/FontDataGdk.cpp: Removed.
+        * platform/gtk/FontDataGtk.cpp: Added.
+        * platform/gtk/FontGdk.cpp: Removed.
+        * platform/gtk/FontGtk.cpp: Added.
+        * platform/gtk/FontPlatformDataGdk.cpp: Removed.
+        * platform/gtk/FontPlatformDataGtk.cpp: Added.
+        * platform/gtk/GlyphPageTreeNodeGdk.cpp: Removed.
+        * platform/gtk/GlyphPageTreeNodeGtk.cpp: Added.
+        * platform/gtk/KeyEventGdk.cpp: Removed.
+        * platform/gtk/KeyEventGtk.cpp: Added.
+        * platform/gtk/LocalizedStringsGdk.cpp: Removed.
+        * platform/gtk/LocalizedStringsGtk.cpp: Added.
+        * platform/gtk/LoggingGdk.cpp: Removed.
+        * platform/gtk/LoggingGtk.cpp: Added.
+        * platform/gtk/MIMETypeRegistryGdk.cpp: Removed.
+        * platform/gtk/MIMETypeRegistryGtk.cpp: Added.
+        * platform/gtk/MouseEventGdk.cpp: Removed.
+        * platform/gtk/MouseEventGtk.cpp: Added.
+        * platform/gtk/PasteboardGdk.cpp: Removed.
+        * platform/gtk/PasteboardGtk.cpp: Added.
+        * platform/gtk/PlatformScreenGdk.cpp: Removed.
+        * platform/gtk/PlatformScreenGtk.cpp: Added.
+        * platform/gtk/PlatformScrollBarGdk.cpp: Removed.
+        * platform/gtk/PlatformScrollBarGtk.cpp: Added.
+        * platform/gtk/PopupMenuGdk.cpp: Removed.
+        * platform/gtk/PopupMenuGtk.cpp: Added.
+        * platform/gtk/RenderThemeGdk.cpp: Removed.
+        * platform/gtk/RenderThemeGdk.h: Removed.
+        * platform/gtk/RenderThemeGtk.cpp: Added.
+        (WebCore::theme):
+        (WebCore::RenderThemeGtk::RenderThemeGtk):
+        (WebCore::RenderThemeGtk::close):
+        (WebCore::RenderThemeGtk::addIntrinsicMargins):
+        (WebCore::RenderThemeGtk::supportsFocus):
+        (WebCore::RenderThemeGtk::determineState):
+        (WebCore::RenderThemeGtk::determineShadow):
+        (WebCore::RenderThemeGtk::getThemeData):
+        (WebCore::RenderThemeGtk::setCheckboxSize):
+        (WebCore::RenderThemeGtk::paintCheckbox):
+        (WebCore::RenderThemeGtk::setRadioSize):
+        (WebCore::RenderThemeGtk::paintRadio):
+        (WebCore::RenderThemeGtk::paintButton):
+        (WebCore::RenderThemeGtk::adjustTextFieldStyle):
+        (WebCore::RenderThemeGtk::paintTextField):
+        (WebCore::RenderThemeGtk::paintTextArea):
+        (WebCore::RenderThemeGtk::adjustButtonStyle):
+        (WebCore::RenderThemeGtk::systemFont):
+        (WebCore::RenderThemeGtk::gtkButton):
+        (WebCore::RenderThemeGtk::gtkCheckbox):
+        (WebCore::RenderThemeGtk::gtkRadioButton):
+        (WebCore::RenderThemeGtk::gtkWindowContainer):
+        * platform/gtk/RenderThemeGtk.h: Added.
+        * platform/gtk/ScrollViewGdk.cpp: Removed.
+        * platform/gtk/ScrollViewGtk.cpp: Added.
+        * platform/gtk/SearchPopupMenuGdk.cpp: Removed.
+        * platform/gtk/SearchPopupMenuGtk.cpp: Added.
+        * platform/gtk/SoundGdk.cpp: Removed.
+        * platform/gtk/SoundGtk.cpp: Added.
+        * platform/gtk/WheelEventGdk.cpp: Removed.
+        * platform/gtk/WheelEventGtk.cpp: Added.
+        * platform/gtk/WidgetGdk.cpp: Removed.
+        * platform/gtk/WidgetGtk.cpp: Added.
+        * platform/network/ResourceHandle.h:
+
 2007-09-23  Rob Buis  <buis@kde.org>
 
         Reviewed by Hyatt.

diff --git a/WebCore/Projects/gdk/webcore-gdk.bkl b/WebCore/Projects/gdk/webcore-gdk.bkl
index 6de765a..266e9b3 100644 (file)
--- a/WebCore/Projects/gdk/webcore-gdk.bkl
+++ b/WebCore/Projects/gdk/webcore-gdk.bkl
@@ -44,30 +44,30 @@
         <define>ENABLE_XPATH</define>
  
         <sources>
-            platform/gdk/CookieJarGdk.cpp
-            platform/gdk/CursorGdk.cpp
-            platform/gdk/DragDataGdk.cpp
-            platform/gdk/DragImageGdk.cpp
+            platform/gdk/CookieJarGtk.cpp
+            platform/gdk/CursorGtk.cpp
+            platform/gdk/DragDataGtk.cpp
+            platform/gdk/DragImageGtk.cpp
             platform/gdk/EditorClientGdk.cpp
-            platform/gdk/FontCacheGdk.cpp
-            platform/gdk/FontDataGdk.cpp
-            platform/gdk/FontGdk.cpp
-            platform/gdk/FontPlatformDataGdk.cpp
-            platform/gdk/FrameGdk.cpp
-            platform/gdk/GlyphPageTreeNodeGdk.cpp
-            platform/gdk/KeyEventGdk.cpp
+            platform/gdk/FontCacheGtk.cpp
+            platform/gdk/FontDataGtk.cpp
+            platform/gdk/FontGtk.cpp
+            platform/gdk/FontPlatformDataGtk.cpp
+            platform/gdk/FrameGtk.cpp
+            platform/gdk/GlyphPageTreeNodeGtk.cpp
+            platform/gdk/KeyEventGtk.cpp
             platform/gdk/MimeTypeRegistryGdk.cpp
-            platform/gdk/MouseEventGdk.cpp
-            platform/gdk/PopupMenuGdk.cpp
-            platform/gdk/RenderThemeGdk.cpp
-            platform/gdk/ScrollViewGdk.cpp
+            platform/gdk/MouseEventGtk.cpp
+            platform/gdk/PopupMenuGtk.cpp
+            platform/gdk/RenderThemeGtk.cpp
+            platform/gdk/ScrollViewGtk.cpp
             platform/gdk/ScreenGdk.cpp
             platform/gdk/SharedTimerLinux.cpp
             platform/gdk/SystemTimeLinux.cpp
             platform/gdk/TemporaryLinkStubs.cpp
-            platform/gdk/WheelEventGdk.cpp
-            platform/gdk/WidgetGdk.cpp
-            platform/graphics/gdk/ImageGdk.cpp
+            platform/gdk/WheelEventGtk.cpp
+            platform/gdk/WidgetGtk.cpp
+            platform/graphics/gdk/ImageGtk.cpp
             platform/network/gdk/ResourceHandleCurl.cpp
             platform/network/gdk/ResourceHandleManager.cpp
 

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 0e61987..ae6de34 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -5,11 +5,11 @@ CONFIG += building-libs
 # of API/Node.c and dom/Node.cpp
 CONFIG += no_batch
 include($$PWD/../WebKit.pri)
-gdk-port:LIBS -= -lWebKitGdk
+gtk-port:LIBS -= -lWebKitGtk
 
 TEMPLATE = lib
 qt-port:TARGET = QtWebKit
-gdk-port:TARGET = WebKitGdk
+gtk-port:TARGET = WebKitGtk
 OBJECTS_DIR = tmp
 OBJECTS_DIR_WTR = $$OBJECTS_DIR/
 win32-*: OBJECTS_DIR_WTR ~= s|/|\|
@@ -53,10 +53,10 @@ win32-g++ {
 # Optional components (look for defs in config.h and included files!)
 !contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
 !contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
-gdk-port:!contains(DEFINES, ENABLE_XSLT=.): DEFINES += ENABLE_XSLT=1
+gtk-port:!contains(DEFINES, ENABLE_XSLT=.): DEFINES += ENABLE_XSLT=1
 #!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
 qt-port: !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
-gdk-port:DEFINES += ENABLE_SVG=1
+gtk-port:DEFINES += ENABLE_SVG=1
 
 DEFINES += WTF_CHANGES=1
 
@@ -87,7 +87,7 @@ DEPENDPATH += editing/qt history/qt loader/qt page/qt \
     DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
 }
 
-gdk-port {
+gtk-port {
     INCLUDEPATH += \
     $$PWD/platform/graphics/svg/cairo \
     $$PWD/platform/image-decoders/bmp \
@@ -745,7 +745,7 @@ SOURCES += \
     xml/XSLTExtensions.cpp \
     xml/XSLTProcessor.cpp
 
-gdk-port {
+gtk-port {
   SOURCES += \
     platform/GlyphPageTreeNode.cpp \
     platform/GlyphWidthMap.cpp \
@@ -848,9 +848,9 @@ qt-port {
     else: SOURCES += platform/win/SystemTimeWin.cpp
 }
 
-gdk-port {
+gtk-port {
     HEADERS += \
-        ../WebCore/platform/gdk/ClipboardGdk.h \
+        ../WebCore/platform/gtk/ClipboardGtk.h \
         ../WebKit/gtk/Api/webkitgtkdefines.h \
         ../WebKit/gtk/Api/webkitgtkframe.h \
         ../WebKit/gtk/Api/webkitgtkglobal.h \
@@ -868,44 +868,44 @@ gdk-port {
         platform/StringTruncator.cpp \
         platform/TextCodecICU.cpp \
         platform/TextBreakIteratorICU.cpp \
-        page/gdk/EventHandlerGdk.cpp \
-        page/gdk/FrameGdk.cpp \
-        page/gdk/DragControllerGdk.cpp \
-        loader/gdk/DocumentLoaderGdk.cpp \
-        platform/gdk/ClipboardGdk.cpp \
-        platform/gdk/CookieJarGdk.cpp \
-        platform/gdk/CursorGdk.cpp \
-        platform/gdk/ContextMenuGdk.cpp \
-        platform/gdk/ContextMenuItemGdk.cpp \
-        platform/gdk/DragDataGdk.cpp \
-        platform/gdk/DragImageGdk.cpp \
-        platform/gdk/FileChooserGdk.cpp \
-        platform/gdk/FileSystemGdk.cpp \
-        platform/gdk/FontCacheGdk.cpp \
-        platform/gdk/FontDataGdk.cpp \
-        platform/gdk/FontGdk.cpp \
-        platform/gdk/FontPlatformDataGdk.cpp \
-        platform/gdk/GlyphPageTreeNodeGdk.cpp \
-        platform/gdk/KeyEventGdk.cpp \
-        platform/gdk/LocalizedStringsGdk.cpp \
-        platform/gdk/LoggingGdk.cpp \
-        platform/gdk/MIMETypeRegistryGdk.cpp \
-        platform/gdk/MouseEventGdk.cpp \
-        platform/gdk/PasteboardGdk.cpp \
-        platform/gdk/PlatformScreenGdk.cpp \
-        platform/gdk/PlatformScrollBarGdk.cpp \
-        platform/gdk/PopupMenuGdk.cpp \
-        platform/gdk/RenderThemeGdk.cpp \
-        platform/gdk/SearchPopupMenuGdk.cpp \
-        platform/gdk/ScrollViewGdk.cpp \
-        platform/gdk/SharedTimerLinux.cpp \
-        platform/gdk/SoundGdk.cpp \
-        platform/gdk/SystemTimeLinux.cpp \
-        platform/gdk/TemporaryLinkStubs.cpp \
-        platform/gdk/WheelEventGdk.cpp \
-        platform/gdk/WidgetGdk.cpp \
-        platform/graphics/gdk/IconGdk.cpp \
-        platform/graphics/gdk/ImageGdk.cpp \
+        page/gtk/EventHandlerGtk.cpp \
+        page/gtk/FrameGtk.cpp \
+        page/gtk/DragControllerGtk.cpp \
+        loader/gtk/DocumentLoaderGtk.cpp \
+        platform/gtk/ClipboardGtk.cpp \
+        platform/gtk/CookieJarGtk.cpp \
+        platform/gtk/CursorGtk.cpp \
+        platform/gtk/ContextMenuGtk.cpp \
+        platform/gtk/ContextMenuItemGtk.cpp \
+        platform/gtk/DragDataGtk.cpp \
+        platform/gtk/DragImageGtk.cpp \
+        platform/gtk/FileChooserGtk.cpp \
+        platform/gtk/FileSystemGtk.cpp \
+        platform/gtk/FontCacheGtk.cpp \
+        platform/gtk/FontDataGtk.cpp \
+        platform/gtk/FontGtk.cpp \
+        platform/gtk/FontPlatformDataGtk.cpp \
+        platform/gtk/GlyphPageTreeNodeGtk.cpp \
+        platform/gtk/KeyEventGtk.cpp \
+        platform/gtk/LocalizedStringsGtk.cpp \
+        platform/gtk/LoggingGtk.cpp \
+        platform/gtk/MIMETypeRegistryGtk.cpp \
+        platform/gtk/MouseEventGtk.cpp \
+        platform/gtk/PasteboardGtk.cpp \
+        platform/gtk/PlatformScreenGtk.cpp \
+        platform/gtk/PlatformScrollBarGtk.cpp \
+        platform/gtk/PopupMenuGtk.cpp \
+        platform/gtk/RenderThemeGtk.cpp \
+        platform/gtk/SearchPopupMenuGtk.cpp \
+        platform/gtk/ScrollViewGtk.cpp \
+        platform/gtk/SharedTimerLinux.cpp \
+        platform/gtk/SoundGtk.cpp \
+        platform/gtk/SystemTimeLinux.cpp \
+        platform/gtk/TemporaryLinkStubs.cpp \
+        platform/gtk/WheelEventGtk.cpp \
+        platform/gtk/WidgetGtk.cpp \
+        platform/graphics/gtk/IconGtk.cpp \
+        platform/graphics/gtk/ImageGtk.cpp \
         platform/network/curl/ResourceHandleCurl.cpp \
         platform/network/curl/ResourceHandleManager.cpp \
         platform/graphics/cairo/AffineTransformCairo.cpp \
@@ -990,7 +990,7 @@ contains(DEFINES, ENABLE_SVG=1) {
        DEPENDPATH += platform/graphics/svg/qt
     }
 
-    gdk-port {
+    gtk-port {
        DEPENDPATH += platform/graphics/svg/cairo
     }
 
@@ -1307,7 +1307,7 @@ qt-port:SOURCES += \
         platform/graphics/svg/qt/SVGResourceFilterQt.cpp \
         platform/graphics/svg/qt/SVGResourceMaskerQt.cpp
 
-gdk-port:SOURCES += \
+gtk-port:SOURCES += \
         platform/graphics/svg/cairo/RenderPathCairo.cpp \
         platform/graphics/svg/cairo/SVGPaintServerCairo.cpp \
         platform/graphics/svg/cairo/SVGPaintServerGradientCairo.cpp \
@@ -1523,7 +1523,7 @@ qt-port {
     }
 }
 
-gdk-port {
+gtk-port {
     isEmpty(WEBKIT_LIB_DIR):WEBKIT_LIB_DIR=$$[QT_INSTALL_LIBS]
     isEmpty(WEBKIT_INC_DIR):WEBKIT_INC_DIR=$$[QT_INSTALL_HEADERS]/WebKitGtk
 

diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl
index a2bb1ee..7ea3fec 100644 (file)
--- a/WebCore/WebCoreSources.bkl
+++ b/WebCore/WebCoreSources.bkl
@@ -123,9 +123,9 @@
         page/MouseEventWithHitTestResults.cpp
         page/Page.cpp
         page/Settings.cpp
-        page/gdk/EventHandlerGdk.cpp
+        page/gdk/EventHandlerGtk.cpp
         page/gdk/ContextMenuClientGdk.cpp
-        page/gdk/DragControllerGdk.cpp
+        page/gdk/DragControllerGtk.cpp
         page/gdk/InspectorClientGdk.cpp
     </set>
 
@@ -153,7 +153,7 @@
         loader/TextDocument.cpp
         loader/TextResourceDecoder.cpp
         loader/loader.cpp
-        loader/gdk/DocumentLoaderGdk.cpp
+        loader/gdk/DocumentLoaderGtk.cpp
         loader/gdk/FrameLoaderClientGdk.cpp
     </set>
 

diff --git a/WebCore/loader/gdk/DocumentLoaderGdk.cpp b/WebCore/loader/gtk/DocumentLoaderGtk.cpp
similarity index 100%
rename from WebCore/loader/gdk/DocumentLoaderGdk.cpp
rename to WebCore/loader/gtk/DocumentLoaderGtk.cpp

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 4f7c9f5..eb6b03f 100644 (file)
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -928,7 +928,7 @@ void FrameView::setWasScrolledByUser(bool wasScrolledByUser)
     d->m_wasScrolledByUser = wasScrolledByUser;
 }
 
-#if PLATFORM(WIN) || PLATFORM(GDK)
+#if PLATFORM(WIN) || PLATFORM(GTK)
 void FrameView::layoutIfNeededRecursive()
 {
     // We have to crawl our entire tree looking for any FrameViews that need

diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index 5fba1e2..ab35485 100644 (file)
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -127,7 +127,7 @@ public:
 
     // FIXME: This method should be used by all platforms, but currently depends on ScrollView::children,
     // which not all methods have. Once FrameView and ScrollView are merged, this #if should be removed.
-#if PLATFORM(WIN) || PLATFORM(GDK)
+#if PLATFORM(WIN) || PLATFORM(GTK)
     void layoutIfNeededRecursive();
 #endif
 

diff --git a/WebCore/page/gdk/DragControllerGdk.cpp b/WebCore/page/gtk/DragControllerGtk.cpp
similarity index 100%
rename from WebCore/page/gdk/DragControllerGdk.cpp
rename to WebCore/page/gtk/DragControllerGtk.cpp

diff --git a/WebCore/page/gdk/EventHandlerGdk.cpp b/WebCore/page/gtk/EventHandlerGtk.cpp
similarity index 97%
rename from WebCore/page/gdk/EventHandlerGdk.cpp
rename to WebCore/page/gtk/EventHandlerGtk.cpp
index fa7904b..d2dedcf 100644 (file)
--- a/WebCore/page/gdk/EventHandlerGdk.cpp
+++ b/WebCore/page/gtk/EventHandlerGtk.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "EventHandler.h"
 
-#include "ClipboardGdk.h"
+#include "ClipboardGtk.h"
 #include "EventNames.h"
 #include "FloatPoint.h"
 #include "FocusController.h"
@@ -89,7 +89,7 @@ bool EventHandler::passWheelEventToWidget(PlatformWheelEvent&, Widget* widget)
 
 Clipboard* EventHandler::createDraggingClipboard() const 
 {
-    return new ClipboardGdk(ClipboardWritable, true);
+    return new ClipboardGtk(ClipboardWritable, true);
 }
 
 bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)

diff --git a/WebCore/page/gdk/FrameGdk.cpp b/WebCore/page/gtk/FrameGtk.cpp
similarity index 100%
rename from WebCore/page/gdk/FrameGdk.cpp
rename to WebCore/page/gtk/FrameGtk.cpp

diff --git a/WebCore/platform/ContextMenuItem.h b/WebCore/platform/ContextMenuItem.h
index c708545..67fb063 100644 (file)
--- a/WebCore/platform/ContextMenuItem.h
+++ b/WebCore/platform/ContextMenuItem.h
@@ -40,7 +40,7 @@ class NSMenuItem;
 #endif
 #elif PLATFORM(WIN)
 typedef struct tagMENUITEMINFOW* LPMENUITEMINFO;
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
 typedef struct _GtkMenuItem GtkMenuItem;
 #elif PLATFORM(QT)
 #include <QAction>
@@ -136,7 +136,7 @@ namespace WebCore {
         PlatformMenuDescription subMenu;
     };
     typedef PlatformMenuItemDescriptionType* PlatformMenuItemDescription;
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
     typedef GtkMenuItem* PlatformMenuItemDescription;
 #endif
 

diff --git a/WebCore/platform/Cursor.h b/WebCore/platform/Cursor.h
index 83bd985..be7f458 100644 (file)
--- a/WebCore/platform/Cursor.h
+++ b/WebCore/platform/Cursor.h
@@ -33,7 +33,7 @@ typedef struct HICON__* HICON;
 typedef HICON HCURSOR;
 #include <Shared.h>
 #include <wtf/RefPtr.h>
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
 #include <gdk/gdk.h>
 #elif PLATFORM(QT)
 #include <QCursor>
@@ -66,7 +66,7 @@ namespace WebCore {
     typedef RefPtr<SharedCursor> PlatformCursor;
 #elif PLATFORM(MAC)
     typedef NSCursor* PlatformCursor;
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
     typedef GdkCursor* PlatformCursor;
 #elif PLATFORM(QT) && !defined(QT_NO_CURSOR)
     typedef QCursor PlatformCursor;

diff --git a/WebCore/platform/DragData.h b/WebCore/platform/DragData.h
index 8a0f5b9..f368274 100644 (file)
--- a/WebCore/platform/DragData.h
+++ b/WebCore/platform/DragData.h
@@ -47,7 +47,7 @@ class QMimeData;
 typedef const QMimeData* DragDataRef;
 #elif PLATFORM(WIN)
 typedef struct IDataObject* DragDataRef;
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
 // FIXME: this should probably be something gdk-specific
 typedef void* DragDataRef;
 #endif

diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h
index 38ac5e8..c993382 100644 (file)
--- a/WebCore/platform/DragImage.h
+++ b/WebCore/platform/DragImage.h
@@ -60,7 +60,7 @@ namespace WebCore {
     typedef QImage* DragImageRef;
 #elif PLATFORM(WIN)
     typedef HBITMAP DragImageRef;
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
     typedef void* DragImageRef;
 #endif
     

diff --git a/WebCore/platform/FontData.h b/WebCore/platform/FontData.h
index 517ad84..c69dc13 100644 (file)
--- a/WebCore/platform/FontData.h
+++ b/WebCore/platform/FontData.h
@@ -89,7 +89,7 @@ public:
     SCRIPT_CACHE* scriptCache() const { return &m_scriptCache; }
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
     void setFont(cairo_t*) const;
 #endif
 

diff --git a/WebCore/platform/NotImplemented.h b/WebCore/platform/NotImplemented.h
index c9367a2..85ecb82 100644 (file)
--- a/WebCore/platform/NotImplemented.h
+++ b/WebCore/platform/NotImplemented.h
@@ -29,7 +29,7 @@
 #include "Logging.h"
 #include <wtf/Assertions.h>
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
     #define supressNotImplementedWarning() getenv("DISABLE_NI_WARNING")
 #else
     #define supressNotImplementedWarning() false

diff --git a/WebCore/platform/PlatformKeyboardEvent.h b/WebCore/platform/PlatformKeyboardEvent.h
index 2df8ef3..b84716d 100644 (file)
--- a/WebCore/platform/PlatformKeyboardEvent.h
+++ b/WebCore/platform/PlatformKeyboardEvent.h
@@ -44,7 +44,7 @@ typedef unsigned WPARAM;
 typedef long LPARAM;
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 typedef struct _GdkEventKey GdkEventKey;
 #endif
 
@@ -79,7 +79,7 @@ namespace WebCore {
         PlatformKeyboardEvent(HWND, WPARAM, LPARAM, UChar);
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
         PlatformKeyboardEvent(GdkEventKey*);
 #endif
 

diff --git a/WebCore/platform/PlatformMenuDescription.h b/WebCore/platform/PlatformMenuDescription.h
index ed1477b..0fdd102 100644 (file)
--- a/WebCore/platform/PlatformMenuDescription.h
+++ b/WebCore/platform/PlatformMenuDescription.h
@@ -36,7 +36,7 @@ class NSMutableArray;
 typedef struct HMENU__* HMENU;
 #elif PLATFORM(QT)
 class QMenu;
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
 typedef struct _GtkMenu GtkMenu;
 #endif
 
@@ -48,7 +48,7 @@ namespace WebCore {
     typedef HMENU PlatformMenuDescription;
 #elif PLATFORM(QT)
     typedef QMenu* PlatformMenuDescription;
-#elif PLATFORM(GDK)
+#elif PLATFORM(GTK)
     typedef GtkMenu* PlatformMenuDescription;
 #endif
 

diff --git a/WebCore/platform/PlatformMouseEvent.h b/WebCore/platform/PlatformMouseEvent.h
index 7ede64d..00f4bce 100644 (file)
--- a/WebCore/platform/PlatformMouseEvent.h
+++ b/WebCore/platform/PlatformMouseEvent.h
@@ -48,7 +48,7 @@ typedef unsigned WPARAM;
 typedef long LPARAM;
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 typedef struct _GdkEventButton GdkEventButton;
 typedef struct _GdkEventMotion GdkEventMotion;
 #endif
@@ -118,7 +118,7 @@ namespace WebCore {
         void setClickCount(int count) { m_clickCount = count; }
         bool activatedWebView() const { return m_activatedWebView; }
 #endif
-#if PLATFORM(GDK) 
+#if PLATFORM(GTK) 
         PlatformMouseEvent(GdkEventButton*);
         PlatformMouseEvent(GdkEventMotion*);
 #endif

diff --git a/WebCore/platform/PlatformWheelEvent.h b/WebCore/platform/PlatformWheelEvent.h
index af564ac..d6c0242 100644 (file)
--- a/WebCore/platform/PlatformWheelEvent.h
+++ b/WebCore/platform/PlatformWheelEvent.h
@@ -42,7 +42,7 @@ typedef unsigned WPARAM;
 typedef long LPARAM;
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 typedef struct _GdkEventScroll GdkEventScroll;
 #endif
 
@@ -84,7 +84,7 @@ namespace WebCore {
 #if PLATFORM(WIN)
         PlatformWheelEvent(HWND, WPARAM, LPARAM, bool isHorizontal);
 #endif
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
         PlatformWheelEvent(GdkEventScroll*);
 #endif
 #if PLATFORM(QT)

diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h
index ca94834..1a268fb 100644 (file)
--- a/WebCore/platform/ScrollView.h
+++ b/WebCore/platform/ScrollView.h
@@ -31,7 +31,7 @@
 #include "Widget.h"
 #include <wtf/HashSet.h>
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 typedef struct _GtkAdjustment GtkAdjustment;
 #endif
 
@@ -151,7 +151,7 @@ namespace WebCore {
         ScrollViewPrivate* m_data;
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
         ScrollView();
         ~ScrollView();
 

diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h
index f9fe5ed..ea84a6d 100644 (file)
--- a/WebCore/platform/Widget.h
+++ b/WebCore/platform/Widget.h
@@ -40,7 +40,7 @@ class NSView;
 typedef struct HWND__* HWND;
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 typedef struct _GdkDrawable GdkDrawable;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkContainer GtkContainer;
@@ -136,7 +136,7 @@ namespace WebCore {
 
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
         virtual void setParent(ScrollView*);
         ScrollView* parent() const;
 

diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index f9df5c8..03df659 100644 (file)
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -45,7 +45,7 @@ typedef QPainter PlatformGraphicsContext;
 typedef void PlatformGraphicsContext;
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 typedef struct _GdkDrawable GdkDrawable;
 typedef struct _GdkEventExpose GdkEventExpose;
 #endif
@@ -215,7 +215,7 @@ namespace WebCore {
         PlatformPath* currentPath();
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
         void setGdkExposeEvent(GdkEventExpose*);
         GdkDrawable* gdkDrawable() const;
         GdkEventExpose* gdkExposeEvent() const;

diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index c225d7b..80ed6b3 100644 (file)
--- a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -45,7 +45,7 @@
 #include <cairo-win32.h>
 #endif
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 #include <gdk/gdk.h>
 #endif
 
@@ -64,7 +64,7 @@ public:
     cairo_t* cr;
     Vector<float> layers;
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
     GdkEventExpose* expose;
 #endif
 };
@@ -87,7 +87,7 @@ static inline void fillRectSourceOver(cairo_t* cr, const FloatRect& rect, const
 
 GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate()
     :  cr(0)
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
     , expose(0)
 #endif
 {
@@ -559,7 +559,7 @@ void GraphicsContext::setPlatformFont(const Font& font)
     if (paintingDisabled())
         return;
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
     // FIXME: is it the right thing to do? Also, doesn't work on Win because
     // there FontData doesn't have ::setFont()
     const FontData *fontData = font.primaryFont();
@@ -803,7 +803,7 @@ void GraphicsContext::fillRoundedRect(const IntRect&, const IntSize& topLeft, co
     notImplemented();
 }
 
-#if PLATFORM(GDK)
+#if PLATFORM(GTK)
 void GraphicsContext::setGdkExposeEvent(GdkEventExpose* expose)
 {
     m_data->expose = expose;

diff --git a/WebCore/platform/graphics/gdk/IconGdk.cpp b/WebCore/platform/graphics/gtk/IconGtk.cpp
similarity index 100%
rename from WebCore/platform/graphics/gdk/IconGdk.cpp
rename to WebCore/platform/graphics/gtk/IconGtk.cpp

diff --git a/WebCore/platform/graphics/gdk/ImageGdk.cpp b/WebCore/platform/graphics/gtk/ImageGtk.cpp
similarity index 100%
rename from WebCore/platform/graphics/gdk/ImageGdk.cpp
rename to WebCore/platform/graphics/gtk/ImageGtk.cpp

diff --git a/WebCore/platform/gdk/ClipboardGdk.cpp b/WebCore/platform/gtk/ClipboardGtk.cpp
similarity index 71%
rename from WebCore/platform/gdk/ClipboardGdk.cpp
rename to WebCore/platform/gtk/ClipboardGtk.cpp
index 0fc6aa6..3ffa3f1 100644 (file)
--- a/WebCore/platform/gdk/ClipboardGdk.cpp
+++ b/WebCore/platform/gtk/ClipboardGtk.cpp
@@ -25,102 +25,102 @@
  */
 
 #include "config.h"
-#include "ClipboardGdk.h"
+#include "ClipboardGtk.h"
 
 #include "NotImplemented.h"
 #include "StringHash.h"
 
 namespace WebCore {
-ClipboardGdk::ClipboardGdk(ClipboardAccessPolicy policy, bool forDragging)
+ClipboardGtk::ClipboardGtk(ClipboardAccessPolicy policy, bool forDragging)
     : Clipboard(policy, forDragging)
 {
     notImplemented();
 }
 
-ClipboardGdk::~ClipboardGdk()
+ClipboardGtk::~ClipboardGtk()
 {
     notImplemented();
 }
 
-void ClipboardGdk::clearData(const String&)
+void ClipboardGtk::clearData(const String&)
 {
     notImplemented();
 }
 
-void ClipboardGdk::clearAllData()
+void ClipboardGtk::clearAllData()
 {
     notImplemented();
 }
 
-String ClipboardGdk::getData(const String&, bool &success) const
+String ClipboardGtk::getData(const String&, bool &success) const
 {
     notImplemented();
     success = false;
     return String();
 }
 
-bool ClipboardGdk::setData(const String&, const String&)
+bool ClipboardGtk::setData(const String&, const String&)
 {
     notImplemented();
     return false;
 }
 
-HashSet<String> ClipboardGdk::types() const
+HashSet<String> ClipboardGtk::types() const
 {
     notImplemented();
     return HashSet<String>();
 }
 
-IntPoint ClipboardGdk::dragLocation() const
+IntPoint ClipboardGtk::dragLocation() const
 {
     notImplemented();
     return IntPoint(0, 0);
 }
 
-CachedImage* ClipboardGdk::dragImage() const
+CachedImage* ClipboardGtk::dragImage() const
 {
     notImplemented();
     return 0;
 }
 
-void ClipboardGdk::setDragImage(CachedImage*, const IntPoint&)
+void ClipboardGtk::setDragImage(CachedImage*, const IntPoint&)
 {
     notImplemented();
 }
 
-Node* ClipboardGdk::dragImageElement()
+Node* ClipboardGtk::dragImageElement()
 {
     notImplemented();
     return 0;
 }
 
-void ClipboardGdk::setDragImageElement(Node*, const IntPoint&)
+void ClipboardGtk::setDragImageElement(Node*, const IntPoint&)
 {
     notImplemented();
 }
 
-DragImageRef ClipboardGdk::createDragImage(IntPoint&) const
+DragImageRef ClipboardGtk::createDragImage(IntPoint&) const
 {
     notImplemented();
     return 0;
 }
 
-void ClipboardGdk::declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*)
+void ClipboardGtk::declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*)
 {
     notImplemented();
 }
 
-void ClipboardGdk::writeURL(const KURL&, const String&, Frame*)
+void ClipboardGtk::writeURL(const KURL&, const String&, Frame*)
 {
     notImplemented();
 }
 
-void ClipboardGdk::writeRange(Range*, Frame*)
+void ClipboardGtk::writeRange(Range*, Frame*)
 {
     notImplemented();
 }
 
-bool ClipboardGdk::hasData()
+bool ClipboardGtk::hasData()
 {
     notImplemented();
     return false;

diff --git a/WebCore/platform/gdk/ClipboardGdk.h b/WebCore/platform/gtk/ClipboardGtk.h
similarity index 92%
rename from WebCore/platform/gdk/ClipboardGdk.h
rename to WebCore/platform/gtk/ClipboardGtk.h
index ae9c356..29b0bcd 100644 (file)
--- a/WebCore/platform/gdk/ClipboardGdk.h
+++ b/WebCore/platform/gtk/ClipboardGtk.h
@@ -33,11 +33,11 @@ namespace WebCore {
     class CachedImage;
 
     // State available during IE's events for drag and drop and copy/paste
-    // Created from the EventHandlerGdk to be used by the dom
-    class ClipboardGdk : public Clipboard {
+    // Created from the EventHandlerGtk to be used by the dom
+    class ClipboardGtk : public Clipboard {
     public:
-        ClipboardGdk(ClipboardAccessPolicy, bool);
-        ~ClipboardGdk();
+        ClipboardGtk(ClipboardAccessPolicy, bool);
+        ~ClipboardGtk();
 
 
         void clearData(const String&);

diff --git a/WebCore/platform/gdk/ContextMenuGdk.cpp b/WebCore/platform/gtk/ContextMenuGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/ContextMenuGdk.cpp
rename to WebCore/platform/gtk/ContextMenuGtk.cpp

diff --git a/WebCore/platform/gdk/ContextMenuItemGdk.cpp b/WebCore/platform/gtk/ContextMenuItemGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/ContextMenuItemGdk.cpp
rename to WebCore/platform/gtk/ContextMenuItemGtk.cpp

diff --git a/WebCore/platform/gdk/CookieJarGdk.cpp b/WebCore/platform/gtk/CookieJarGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/CookieJarGdk.cpp
rename to WebCore/platform/gtk/CookieJarGtk.cpp

diff --git a/WebCore/platform/gdk/CursorGdk.cpp b/WebCore/platform/gtk/CursorGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/CursorGdk.cpp
rename to WebCore/platform/gtk/CursorGtk.cpp

diff --git a/WebCore/platform/gdk/DragDataGdk.cpp b/WebCore/platform/gtk/DragDataGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/DragDataGdk.cpp
rename to WebCore/platform/gtk/DragDataGtk.cpp

diff --git a/WebCore/platform/gdk/DragImageGdk.cpp b/WebCore/platform/gtk/DragImageGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/DragImageGdk.cpp
rename to WebCore/platform/gtk/DragImageGtk.cpp

diff --git a/WebCore/platform/gdk/FileChooserGdk.cpp b/WebCore/platform/gtk/FileChooserGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/FileChooserGdk.cpp
rename to WebCore/platform/gtk/FileChooserGtk.cpp

diff --git a/WebCore/platform/gdk/FileSystemGdk.cpp b/WebCore/platform/gtk/FileSystemGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/FileSystemGdk.cpp
rename to WebCore/platform/gtk/FileSystemGtk.cpp

diff --git a/WebCore/platform/gdk/FontCacheGdk.cpp b/WebCore/platform/gtk/FontCacheGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/FontCacheGdk.cpp
rename to WebCore/platform/gtk/FontCacheGtk.cpp

diff --git a/WebCore/platform/gdk/FontDataGdk.cpp b/WebCore/platform/gtk/FontDataGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/FontDataGdk.cpp
rename to WebCore/platform/gtk/FontDataGtk.cpp

diff --git a/WebCore/platform/gdk/FontGdk.cpp b/WebCore/platform/gtk/FontGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/FontGdk.cpp
rename to WebCore/platform/gtk/FontGtk.cpp

diff --git a/WebCore/platform/gdk/FontPlatformData.h b/WebCore/platform/gtk/FontPlatformData.h
similarity index 100%
rename from WebCore/platform/gdk/FontPlatformData.h
rename to WebCore/platform/gtk/FontPlatformData.h

diff --git a/WebCore/platform/gdk/FontPlatformDataGdk.cpp b/WebCore/platform/gtk/FontPlatformDataGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/FontPlatformDataGdk.cpp
rename to WebCore/platform/gtk/FontPlatformDataGtk.cpp

diff --git a/WebCore/platform/gdk/GlyphPageTreeNodeGdk.cpp b/WebCore/platform/gtk/GlyphPageTreeNodeGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/GlyphPageTreeNodeGdk.cpp
rename to WebCore/platform/gtk/GlyphPageTreeNodeGtk.cpp

diff --git a/WebCore/platform/gdk/KeyEventGdk.cpp b/WebCore/platform/gtk/KeyEventGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/KeyEventGdk.cpp
rename to WebCore/platform/gtk/KeyEventGtk.cpp

diff --git a/WebCore/platform/gdk/KeyboardCodes.h b/WebCore/platform/gtk/KeyboardCodes.h
similarity index 100%
rename from WebCore/platform/gdk/KeyboardCodes.h
rename to WebCore/platform/gtk/KeyboardCodes.h

diff --git a/WebCore/platform/gdk/LocalizedStringsGdk.cpp b/WebCore/platform/gtk/LocalizedStringsGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/LocalizedStringsGdk.cpp
rename to WebCore/platform/gtk/LocalizedStringsGtk.cpp

diff --git a/WebCore/platform/gdk/LoggingGdk.cpp b/WebCore/platform/gtk/LoggingGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/LoggingGdk.cpp
rename to WebCore/platform/gtk/LoggingGtk.cpp

diff --git a/WebCore/platform/gdk/MIMETypeRegistryGdk.cpp b/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/MIMETypeRegistryGdk.cpp
rename to WebCore/platform/gtk/MIMETypeRegistryGtk.cpp

diff --git a/WebCore/platform/gdk/MouseEventGdk.cpp b/WebCore/platform/gtk/MouseEventGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/MouseEventGdk.cpp
rename to WebCore/platform/gtk/MouseEventGtk.cpp

diff --git a/WebCore/platform/gdk/PasteboardGdk.cpp b/WebCore/platform/gtk/PasteboardGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/PasteboardGdk.cpp
rename to WebCore/platform/gtk/PasteboardGtk.cpp

diff --git a/WebCore/platform/gdk/PlatformScreenGdk.cpp b/WebCore/platform/gtk/PlatformScreenGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/PlatformScreenGdk.cpp
rename to WebCore/platform/gtk/PlatformScreenGtk.cpp

diff --git a/WebCore/platform/gdk/PlatformScrollBar.h b/WebCore/platform/gtk/PlatformScrollBar.h
similarity index 100%
rename from WebCore/platform/gdk/PlatformScrollBar.h
rename to WebCore/platform/gtk/PlatformScrollBar.h

diff --git a/WebCore/platform/gdk/PlatformScrollBarGdk.cpp b/WebCore/platform/gtk/PlatformScrollBarGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/PlatformScrollBarGdk.cpp
rename to WebCore/platform/gtk/PlatformScrollBarGtk.cpp

diff --git a/WebCore/platform/gdk/PopupMenuGdk.cpp b/WebCore/platform/gtk/PopupMenuGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/PopupMenuGdk.cpp
rename to WebCore/platform/gtk/PopupMenuGtk.cpp

diff --git a/WebCore/platform/gdk/RenderThemeGdk.cpp b/WebCore/platform/gtk/RenderThemeGtk.cpp
similarity index 86%
rename from WebCore/platform/gdk/RenderThemeGdk.cpp
rename to WebCore/platform/gtk/RenderThemeGtk.cpp
index 6956a16..aa67bfd 100644 (file)
--- a/WebCore/platform/gdk/RenderThemeGdk.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "RenderThemeGdk.h"
+#include "RenderThemeGtk.h"
 
 #include "NotImplemented.h"
 #include "RenderObject.h"
@@ -67,11 +67,11 @@ namespace WebCore {
 
 RenderTheme* theme()
 {
-    static RenderThemeGdk gdkTheme;
+    static RenderThemeGtk gdkTheme;
     return &gdkTheme;
 }
 
-RenderThemeGdk::RenderThemeGdk()
+RenderThemeGtk::RenderThemeGtk()
     : m_gtkButton(0)
     , m_gtkCheckbox(0)
     , m_gtkRadioButton(0)
@@ -82,11 +82,11 @@ RenderThemeGdk::RenderThemeGdk()
 {
 }
 
-void RenderThemeGdk::close()
+void RenderThemeGtk::close()
 {
 }
 
-void RenderThemeGdk::addIntrinsicMargins(RenderStyle* style) const
+void RenderThemeGtk::addIntrinsicMargins(RenderStyle* style) const
 {
     // Cut out the intrinsic margins completely if we end up using a small font size
     if (style->fontSize() < 11)
@@ -111,7 +111,7 @@ void RenderThemeGdk::addIntrinsicMargins(RenderStyle* style) const
     }
 }
 
-bool RenderThemeGdk::supportsFocus(EAppearance appearance)
+bool RenderThemeGtk::supportsFocus(EAppearance appearance)
 {
     switch (appearance) {
         case PushButtonAppearance:
@@ -125,7 +125,7 @@ bool RenderThemeGdk::supportsFocus(EAppearance appearance)
     return false;
 }
 
-GtkStateType RenderThemeGdk::determineState(RenderObject* o)
+GtkStateType RenderThemeGtk::determineState(RenderObject* o)
 {
     GtkStateType result = GTK_STATE_NORMAL;
     if (!isEnabled(o))
@@ -137,12 +137,12 @@ GtkStateType RenderThemeGdk::determineState(RenderObject* o)
     return result;
 }
 
-GtkShadowType RenderThemeGdk::determineShadow(RenderObject* o)
+GtkShadowType RenderThemeGtk::determineShadow(RenderObject* o)
 {
     return isChecked(o) ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
 }
 
-ThemeData RenderThemeGdk::getThemeData(RenderObject* o)
+ThemeData RenderThemeGtk::getThemeData(RenderObject* o)
 {
     ThemeData result;
     switch (o->style()->appearance()) {
@@ -171,12 +171,12 @@ ThemeData RenderThemeGdk::getThemeData(RenderObject* o)
     return result;
 }
 
-void RenderThemeGdk::setCheckboxSize(RenderStyle* style) const 
+void RenderThemeGtk::setCheckboxSize(RenderStyle* style) const 
 { 
     setRadioSize(style);
 }
 
-bool RenderThemeGdk::paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
+bool RenderThemeGtk::paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
 {
     // FIXME: is it the right thing to do?
     GtkWidget* checkbox = gtkCheckbox();
@@ -189,7 +189,7 @@ bool RenderThemeGdk::paintCheckbox(RenderObject* o, const RenderObject::PaintInf
     return false;
 }
 
-void RenderThemeGdk::setRadioSize(RenderStyle* style) const 
+void RenderThemeGtk::setRadioSize(RenderStyle* style) const 
 { 
     notImplemented(); 
     // If the width and height are both specified, then we have nothing to do.
@@ -209,7 +209,7 @@ void RenderThemeGdk::setRadioSize(RenderStyle* style) const
         style->setHeight(Length(ff, Fixed));
 }
 
-bool RenderThemeGdk::paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
+bool RenderThemeGtk::paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
 { 
     // FIXME: is it the right thing to do?
     GtkWidget* radio = gtkRadioButton();
@@ -222,7 +222,7 @@ bool RenderThemeGdk::paintRadio(RenderObject* o, const RenderObject::PaintInfo&
     return false;
 }
 
-bool RenderThemeGdk::paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect) 
+bool RenderThemeGtk::paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect) 
 { 
     // FIXME: should use theme-aware drawing. This should honor the state as well
     GtkWidget* button = gtkButton();
@@ -234,32 +234,32 @@ bool RenderThemeGdk::paintButton(RenderObject* o, const RenderObject::PaintInfo&
     return false;
 }
 
-void RenderThemeGdk::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element* e) const 
+void RenderThemeGtk::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element* e) const 
 { 
     notImplemented(); 
 }
 
-bool RenderThemeGdk::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+bool RenderThemeGtk::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
     // FIXME: should use theme-aware drawing
     return true;
 }
 
-bool RenderThemeGdk::paintTextArea(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+bool RenderThemeGtk::paintTextArea(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
     return paintTextField(o, i, r);
 }
 
-void RenderThemeGdk::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
+void RenderThemeGtk::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
 {
     addIntrinsicMargins(style);
 }
 
-void RenderThemeGdk::systemFont(int propId, FontDescription&) const
+void RenderThemeGtk::systemFont(int propId, FontDescription&) const
 {
 }
 
-GtkWidget* RenderThemeGdk::gtkButton() const
+GtkWidget* RenderThemeGtk::gtkButton() const
 {
     if (!m_gtkButton) {
         m_gtkButton = gtk_button_new();
@@ -270,7 +270,7 @@ GtkWidget* RenderThemeGdk::gtkButton() const
     return m_gtkButton;
 }
 
-GtkWidget* RenderThemeGdk::gtkCheckbox() const
+GtkWidget* RenderThemeGtk::gtkCheckbox() const
 {
     if (!m_gtkCheckbox) {
         m_gtkCheckbox = gtk_check_button_new();
@@ -281,7 +281,7 @@ GtkWidget* RenderThemeGdk::gtkCheckbox() const
     return m_gtkCheckbox;
 }
 
-GtkWidget* RenderThemeGdk::gtkRadioButton() const
+GtkWidget* RenderThemeGtk::gtkRadioButton() const
 {
     if (!m_gtkRadioButton) {
         m_gtkRadioButton = gtk_radio_button_new(NULL);
@@ -292,7 +292,7 @@ GtkWidget* RenderThemeGdk::gtkRadioButton() const
     return m_gtkRadioButton;
 }
 
-GtkWidget* RenderThemeGdk::gtkWindowContainer() const
+GtkWidget* RenderThemeGtk::gtkWindowContainer() const
 {
     if (!m_container) {
         m_unmappedWindow = gtk_window_new(GTK_WINDOW_POPUP);

diff --git a/WebCore/platform/gdk/RenderThemeGdk.h b/WebCore/platform/gtk/RenderThemeGtk.h
similarity index 97%
rename from WebCore/platform/gdk/RenderThemeGdk.h
rename to WebCore/platform/gtk/RenderThemeGtk.h
index 2d4e2a9..586f47a 100644 (file)
--- a/WebCore/platform/gdk/RenderThemeGdk.h
+++ b/WebCore/platform/gtk/RenderThemeGtk.h
@@ -40,9 +40,9 @@ struct ThemeData {
     unsigned m_state;
 };
 
-class RenderThemeGdk : public RenderTheme {
+class RenderThemeGtk : public RenderTheme {
 public:
-    RenderThemeGdk();
+    RenderThemeGtk();
 
     // A method asking if the theme's controls actually care about redrawing when hovered.
     virtual bool supportsHover(const RenderStyle* style) const { return true; }

diff --git a/WebCore/platform/gdk/ScrollViewGdk.cpp b/WebCore/platform/gtk/ScrollViewGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/ScrollViewGdk.cpp
rename to WebCore/platform/gtk/ScrollViewGtk.cpp

diff --git a/WebCore/platform/gdk/SearchPopupMenuGdk.cpp b/WebCore/platform/gtk/SearchPopupMenuGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/SearchPopupMenuGdk.cpp
rename to WebCore/platform/gtk/SearchPopupMenuGtk.cpp

diff --git a/WebCore/platform/gdk/SharedTimerLinux.cpp b/WebCore/platform/gtk/SharedTimerLinux.cpp
similarity index 100%
rename from WebCore/platform/gdk/SharedTimerLinux.cpp
rename to WebCore/platform/gtk/SharedTimerLinux.cpp

diff --git a/WebCore/platform/gdk/SoundGdk.cpp b/WebCore/platform/gtk/SoundGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/SoundGdk.cpp
rename to WebCore/platform/gtk/SoundGtk.cpp

diff --git a/WebCore/platform/gdk/SystemTimeLinux.cpp b/WebCore/platform/gtk/SystemTimeLinux.cpp
similarity index 100%
rename from WebCore/platform/gdk/SystemTimeLinux.cpp
rename to WebCore/platform/gtk/SystemTimeLinux.cpp

diff --git a/WebCore/platform/gdk/TemporaryLinkStubs.cpp b/WebCore/platform/gtk/TemporaryLinkStubs.cpp
similarity index 100%
rename from WebCore/platform/gdk/TemporaryLinkStubs.cpp
rename to WebCore/platform/gtk/TemporaryLinkStubs.cpp

diff --git a/WebCore/platform/gdk/WheelEventGdk.cpp b/WebCore/platform/gtk/WheelEventGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/WheelEventGdk.cpp
rename to WebCore/platform/gtk/WheelEventGtk.cpp

diff --git a/WebCore/platform/gdk/WidgetGdk.cpp b/WebCore/platform/gtk/WidgetGtk.cpp
similarity index 100%
rename from WebCore/platform/gdk/WidgetGdk.cpp
rename to WebCore/platform/gtk/WidgetGtk.cpp

diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h
index 988bdfa..a58a7de 100644 (file)
--- a/WebCore/platform/network/ResourceHandle.h
+++ b/WebCore/platform/network/ResourceHandle.h
@@ -139,7 +139,7 @@ public:
     friend LRESULT __stdcall ResourceHandleWndProc(HWND, unsigned message, WPARAM, LPARAM);
 #endif
 
-#if PLATFORM(GDK) || PLATFORM(QT)
+#if PLATFORM(GTK) || PLATFORM(QT)
     ResourceHandleInternal* getInternal() { return d.get(); }
 #endif
 

diff --git a/WebKit.pri b/WebKit.pri
index 6719e7c..350c95d 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -6,17 +6,17 @@ isEmpty(OUTPUT_DIR) {
     CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
 }
 
-!gdk-port:CONFIG += qt-port
+!gtk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
 qt-port:!building-libs {
     QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
     LIBS += -lQtWebKit
 }
-gdk-port:CONFIG += link_pkgconfig
-gdk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
-gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
-gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng
-gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+gtk-port:CONFIG += link_pkgconfig
+gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
+gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__
+gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng
+gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
 
 DEFINES += USE_SYSTEM_MALLOC
 CONFIG(release) {
@@ -26,12 +26,12 @@ CONFIG(release) {
 BASE_DIR = $$PWD
 qt-port:INCLUDEPATH += \
     $$PWD/WebKitQt/Api
-gdk-port:INCLUDEPATH += \
-    $$BASE_DIR/WebCore/platform/gdk \
+gtk-port:INCLUDEPATH += \
+    $$BASE_DIR/WebCore/platform/gtk \
     $$BASE_DIR/WebCore/platform/network/curl \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
-    $$BASE_DIR/WebCore/loader/gdk \
-    $$BASE_DIR/WebCore/page/gdk \
+    $$BASE_DIR/WebCore/loader/gtk \
+    $$BASE_DIR/WebCore/page/gtk \
     $$BASE_DIR/WebKit/gtk/Api \
     $$BASE_DIR/WebKit/gtk/WebCoreSupport
 INCLUDEPATH += \

diff --git a/WebKit.pro b/WebKit.pro
index 8e2e944..5ef047a 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-!gdk-port:CONFIG += qt-port
+!gtk-port:CONFIG += qt-port
 qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
         JavaScriptCore/pcre/dftables.pro \
@@ -13,5 +13,5 @@ qt-port {
     !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
 }
 
-gdk-port:SUBDIRS += \
-        WebKitTools/GdkLauncher
+gtk-port:SUBDIRS += \
+        WebKitTools/GtkLauncher

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 338449d..38dc0e3 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,29 @@
+2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Rubber stamped by Adam.
+
+        * GdkLauncher: Removed.
+        * GdkLauncher/Bakefiles.bkgen: Removed.
+        * GdkLauncher/ENV: Removed.
+        * GdkLauncher/GdkLauncher.pro: Removed.
+        * GdkLauncher/gdklauncher.bkl: Removed.
+        * GdkLauncher/main.cpp: Removed.
+        * GdkLauncher/mk: Removed.
+        * GdkLauncher/simple.svg: Removed.
+        * GdkLauncher/text.html: Removed.
+        * GtkLauncher: Added.
+        * GtkLauncher/GdkLauncher.pro: Removed.
+        * GtkLauncher/GtkLauncher.pro: Added.
+        * GtkLauncher/main.cpp:
+        (updateWindowTitle):
+        (main):
+        * Scripts/build-webkit:
+        * Scripts/regenerate-makefiles:
+        * Scripts/run-javascriptcore-tests:
+        * Scripts/run-launcher:
+        * Scripts/run-webkit-tests:
+        * Scripts/webkitdirs.pm:
+
 2007-09-21  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKitTools/GdkLauncher/Bakefiles.bkgen b/WebKitTools/GtkLauncher/Bakefiles.bkgen
similarity index 100%
rename from WebKitTools/GdkLauncher/Bakefiles.bkgen
rename to WebKitTools/GtkLauncher/Bakefiles.bkgen

diff --git a/WebKitTools/GdkLauncher/ENV b/WebKitTools/GtkLauncher/ENV
similarity index 100%
rename from WebKitTools/GdkLauncher/ENV
rename to WebKitTools/GtkLauncher/ENV

diff --git a/WebKitTools/GdkLauncher/GdkLauncher.pro b/WebKitTools/GtkLauncher/GtkLauncher.pro
similarity index 100%
rename from WebKitTools/GdkLauncher/GdkLauncher.pro
rename to WebKitTools/GtkLauncher/GtkLauncher.pro

diff --git a/WebKitTools/GdkLauncher/gdklauncher.bkl b/WebKitTools/GtkLauncher/gdklauncher.bkl
similarity index 100%
rename from WebKitTools/GdkLauncher/gdklauncher.bkl
rename to WebKitTools/GtkLauncher/gdklauncher.bkl

diff --git a/WebKitTools/GdkLauncher/main.cpp b/WebKitTools/GtkLauncher/main.cpp
similarity index 98%
rename from WebKitTools/GdkLauncher/main.cpp
rename to WebKitTools/GtkLauncher/main.cpp
index 7d90dde..2f4fc83 100644 (file)
--- a/WebKitTools/GdkLauncher/main.cpp
+++ b/WebKitTools/GtkLauncher/main.cpp
@@ -51,7 +51,7 @@ static void urlBarEnterCallback(GtkWidget*, GtkWidget* entry)
 static void updateWindowTitle()
 {
     GString* string = g_string_new(NULL);
-    g_string_printf(string, "GdkLauncher %s  (%d/100)", gTitle, gProgress);
+    g_string_printf(string, "GtkLauncher %s  (%d/100)", gTitle, gProgress);
     gchar* title = g_string_free(string, FALSE);
     gtk_window_set_title(GTK_WINDOW(gTopLevelWindow), title);
     g_free(title);
@@ -148,7 +148,7 @@ int main(int argc, char* argv[])
 
     gTopLevelWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_default_size(GTK_WINDOW(gTopLevelWindow), 800, 600);
-    gtk_widget_set_name(gTopLevelWindow, "GdkLauncher");
+    gtk_widget_set_name(gTopLevelWindow, "GtkLauncher");
     GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
     gtk_container_add(GTK_CONTAINER(gTopLevelWindow), vbox);
     g_signal_connect(G_OBJECT(gTopLevelWindow), "destroy", G_CALLBACK(frameDestroyCallback), NULL);

diff --git a/WebKitTools/GdkLauncher/mk b/WebKitTools/GtkLauncher/mk
similarity index 100%
rename from WebKitTools/GdkLauncher/mk
rename to WebKitTools/GtkLauncher/mk

diff --git a/WebKitTools/GdkLauncher/simple.svg b/WebKitTools/GtkLauncher/simple.svg
similarity index 100%
rename from WebKitTools/GdkLauncher/simple.svg
rename to WebKitTools/GtkLauncher/simple.svg

diff --git a/WebKitTools/GdkLauncher/text.html b/WebKitTools/GtkLauncher/text.html
similarity index 100%
rename from WebKitTools/GdkLauncher/text.html
rename to WebKitTools/GtkLauncher/text.html

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index fdc5800..3fc9c45 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -117,13 +117,13 @@ removeLibraryDependingOnSVG("WebCore", $svgSupport);
 for my $dir (@projects) {
     chdir $dir or die;
     my $result = 0;
-    if (isGdk()) {
+    if (isGtk()) {
         if ($dir ne "WebKit") {
             chdir ".." or die;
             next;
         }
 
-        $result = buildQMakeGdkProject($dir, $colorSupport);
+        $result = buildQMakeGtkProject($dir, $colorSupport);
     } elsif (isQt()) {
         if ($dir ne "WebKit") {
             chdir ".." or die;

diff --git a/WebKitTools/Scripts/regenerate-makefiles b/WebKitTools/Scripts/regenerate-makefiles
index 49f344b..e60f96c 100755 (executable)
--- a/WebKitTools/Scripts/regenerate-makefiles
+++ b/WebKitTools/Scripts/regenerate-makefiles
@@ -69,5 +69,5 @@ fi
 
 cd ../../Bakefiles
 bakefile_gen
-cd ../WebKitTools/GdkLauncher
+cd ../WebKitTools/GtkLauncher
 bakefile_gen

diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
index 8f2f928..72aa6c6 100755 (executable)
--- a/WebKitTools/Scripts/run-javascriptcore-tests
+++ b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -59,12 +59,12 @@ my $root;
 # pre-evaluate arguments.  jsDriver args have - preceding, xcode args do not.
 # special arguments
 #     --root=<path to webkit root> use pre-built root
-#     --gdk build gdk 
+#     --gtk build gtk 
 foreach my $arg(@ARGV) {
     print $arg."\n";
     if( $arg =~ /root=(.*)/ ){
         $root = $1;
-    } elsif( $arg =~ /^--gdk$/i ){
+    } elsif( $arg =~ /^--gtk$/i ){
     } elsif( $arg =~ /^-/ or !($arg =~/=/)){
         push( @jsArgs, $arg );
     } else {
@@ -93,7 +93,7 @@ if (!defined($root)){
 my $productDir = productDir();
 chdir "tests/mozilla" or die;
 
-$productDir .= "/JavaScriptCore" if (isQt() or isGdk());
+$productDir .= "/JavaScriptCore" if (isQt() or isGtk());
 $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
 
 my $testkjsName;

diff --git a/WebKitTools/Scripts/run-launcher b/WebKitTools/Scripts/run-launcher
index d589a8e..6fca3b5 100755 (executable)
--- a/WebKitTools/Scripts/run-launcher
+++ b/WebKitTools/Scripts/run-launcher
@@ -48,11 +48,11 @@ print "Starting webkit launcher with LD_LIBRARY_PATH set to point to built WebKi
 my @args = @ARGV;
 $ENV{LD_LIBRARY_PATH} = $ENV{LD_LIBRARY_PATH} ? "$productDir:$ENV{LD_LIBRARY_PATH}" : $productDir;
 
-if (isGdk()) {
-  $launcherPath = "$launcherPath/WebKitTools/GdkLauncher/GdkLauncher";
-  # Strip --gdk from the arg-list, since otherwise GdkLauncher will try to
+if (isGtk()) {
+  $launcherPath = "$launcherPath/WebKitTools/GtkLauncher/GtkLauncher";
+  # Strip --gtk from the arg-list, since otherwise GtkLauncher will try to
   # interpret it as a URL.
-  @args = grep(!/^(--gdk)$/, @args);
+  @args = grep(!/^(--gtk)$/, @args);
 } elsif (isQt()) {
   $launcherPath = "$launcherPath/bin/QtLauncher";
 } else {

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 3281604..6302884 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -131,8 +131,8 @@ if (isTiger()) {
     $platform = "mac";
 } elsif (isQt()) {
     $platform = "qt";
-} elsif (isGdk()) {
-    $platform = "gdk";
+} elsif (isGtk()) {
+    $platform = "gtk";
 } elsif (isCygwin()) {
     # FIXME: The two lines below are a hack to represent that on Windows we
     # currently want to
@@ -264,8 +264,8 @@ if(!defined($root)){
 
         if (isQt()) {
             push(@args, "--qt");
-        } elsif (isGdk()) {
-            push(@args, "--gdk");
+        } elsif (isGtk()) {
+            push(@args, "--gtk");
         }
 
         $buildResult = system "WebKitTools/Scripts/build-dumprendertree", @args;

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index c422c9d..c5977f6 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -50,7 +50,7 @@ my $sourceDir;
 my $currentSVNRevision;
 my $osXVersion;
 my $isQt;
-my $isGdk;
+my $isGtk;
 
 # Variables for Win32 support
 my $vcBuildPath;
@@ -308,7 +308,7 @@ sub builtDylibPathForName
 {
     my $framework = shift;
     determineConfigurationProductDir();
-    if (isQt() or isGdk()) {
+    if (isQt() or isGtk()) {
         return "$configurationProductDir/$framework";
     }
     if (isOSX()) {
@@ -330,7 +330,7 @@ sub checkFrameworks
 {
     return if isCygwin();
     my @frameworks = ("JavaScriptCore", "WebCore");
-    push(@frameworks, "WebKit") if isOSX() and not isGdk() and not isQt();
+    push(@frameworks, "WebKit") if isOSX() and not isGtk() and not isQt();
     for my $framework (@frameworks) {
         my $path = builtDylibPathForName($framework);
         die "Can't find built framework at \"$path\".\n" unless -x $path;
@@ -347,8 +347,8 @@ sub hasSVGSupport
         return 1;
     }
 
-    if (isGdk() and $path =~ /WebCore/) {
-        $path .= "/../lib/libWebKitGdk.so";
+    if (isGtk() and $path =~ /WebCore/) {
+        $path .= "/../lib/libWebKitGtk.so";
     }
 
     open NM, "-|", "nm", $path or die;
@@ -405,24 +405,24 @@ sub determineIsQt()
     $isQt = defined($ENV{'QTDIR'});
 }
 
-sub isGdk()
+sub isGtk()
 {
-    determineIsGdk();
-    return $isGdk;
+    determineIsGtk();
+    return $isGtk;
 }
 
-sub determineIsGdk()
+sub determineIsGtk()
 {
-    return if defined($isGdk);
+    return if defined($isGtk);
 
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];
-        if ($opt =~ /^--gdk$/i ) {
-            $isGdk = 1;
+        if ($opt =~ /^--gtk$/i ) {
+            $isGtk = 1;
             return;
         }
     }
-    $isGdk = 0;
+    $isGtk = 0;
 }
 
 sub isCygwin()
@@ -473,7 +473,7 @@ sub isLeopard()
 sub launcherPath()
 {
     my $relativeScriptsPath = File::Spec->catpath("", File::Spec->abs2rel(dirname($0), getcwd()), "");
-    if (isGdk() || isQt()) {
+    if (isGtk() || isQt()) {
         return "$relativeScriptsPath/run-launcher";
     } elsif (isOSX() || isCygwin()) {
         return "$relativeScriptsPath/run-safari";
@@ -482,8 +482,8 @@ sub launcherPath()
 
 sub launcherName()
 {
-    if (isGdk()) {
-        return "GdkLauncher";
+    if (isGtk()) {
+        return "GtkLauncher";
     } elsif (isQt()) {
         return "QtLauncher";
     } elsif (isOSX() || isCygwin()) {
@@ -510,7 +510,7 @@ sub checkRequiredSystemConfig
             print "http://developer.apple.com/tools/xcode\n";
             print "*************************************************************\n";
         }
-    } elsif (isGdk() or isQt()) {
+    } elsif (isGtk() or isQt()) {
         my @cmds = qw(flex bison gperf);
         my @missing = ();
         foreach my $cmd (@cmds) {
@@ -669,12 +669,12 @@ sub buildQMakeProject($$)
     return $result;
 }
 
-sub buildQMakeGdkProject($$)
+sub buildQMakeGtkProject($$)
 {
     my ($project, $colorize) = @_;
 
     if ($project ne "WebKit") {
-        die "The Gdk portbuilds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
+        die "The Gtk portbuilds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
     }
 
     my $config = configuration();
@@ -690,7 +690,7 @@ sub buildQMakeGdkProject($$)
 
     push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
     push @buildArgs, "CONFIG-=qt";
-    push @buildArgs, "CONFIG+=gdk-port";
+    push @buildArgs, "CONFIG+=gtk-port";
     push @buildArgs, sourceDir() . "/WebKit.pro";
     if ($config =~ m/debug/i) {
         push @buildArgs, "CONFIG-=release";