Commit 2752405f authored by zecke's avatar zecke

/:

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: http://svn.webkit.org/repository/webkit/trunk@25703 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 870d0e29
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
......
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.
......
......@@ -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 \
......
......@@ -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)
}
......
......@@ -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__
}
......
......@@ -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
......
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.
......@@ -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
......
......@@ -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
......
......@@ -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>
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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;
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......