Reviewed by Eric.

        Fix Qt/Linux build after Adele's popup menu changes.

        * CMakeLists.txt:
        * platform/qt/FileChooserQt.cpp:
        (WebCore::FileChooser::disconnectUploadControl):
        * platform/qt/PopupMenuQt.cpp: Added.
        (WebCore::PopupMenu::PopupMenu):
        (WebCore::PopupMenu::~PopupMenu):
        (WebCore::PopupMenu::clear):
        (WebCore::PopupMenu::populate):
        (WebCore::PopupMenu::show):
        (WebCore::PopupMenu::hide):
        (WebCore::PopupMenu::addSeparator):
        (WebCore::PopupMenu::addGroupLabel):
        (WebCore::PopupMenu::addOption):
        * platform/qt/RenderPopupMenuQt.cpp: Removed.
        * platform/qt/RenderPopupMenuQt.h: Removed.
        * platform/qt/RenderThemeQt.cpp:

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

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index c3e9f6627402feb7c5639a7d5eb87b4b99021dec..95a35b2e95fe72ad184d43e56fe24144c1946649 100644 (file)
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1037,7 +1037,7 @@ set(WebCore_SRCS
     platform/qt/RenderThemeQt.cpp
     platform/qt/FontDataQt.cpp
     platform/qt/SharedTimerQt.cpp
-    platform/qt/RenderPopupMenuQt.cpp
+    platform/qt/PopupMenuQt.cpp
     platform/qt/ResourceLoaderManager.cpp
     platform/qt/ResourceLoaderQt.cpp
     platform/qt/FloatPointQt.cpp
@@ -1076,6 +1076,7 @@ set(WebCore_SRCS
     platform/GlyphMap.cpp
     platform/Font.cpp
     platform/FontData.cpp
+    platform/PopupMenu.cpp
     rendering/RenderCounter.cpp
     rendering/CounterNode.cpp
     rendering/CounterResetNode.cpp
@@ -1084,7 +1085,6 @@ set(WebCore_SRCS
     rendering/RenderPartObject.cpp
     rendering/RenderView.cpp
     rendering/RenderMenuList.cpp
-    rendering/RenderPopupMenu.cpp
     rendering/InlineFlowBox.cpp
     rendering/RenderListMarker.cpp
     rendering/RenderImage.cpp

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 18d8ddfeb2b9fa531961b60e965a2bcdb860f875..7eabb792d304ac1fdc555897817ea67400bae043 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2006-10-13  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Eric.
+
+        Fix Qt/Linux build after Adele's popup menu changes.
+
+        * CMakeLists.txt:
+        * platform/qt/FileChooserQt.cpp:
+        (WebCore::FileChooser::disconnectUploadControl):
+        * platform/qt/PopupMenuQt.cpp: Added.
+        (WebCore::PopupMenu::PopupMenu):
+        (WebCore::PopupMenu::~PopupMenu):
+        (WebCore::PopupMenu::clear):
+        (WebCore::PopupMenu::populate):
+        (WebCore::PopupMenu::show):
+        (WebCore::PopupMenu::hide):
+        (WebCore::PopupMenu::addSeparator):
+        (WebCore::PopupMenu::addGroupLabel):
+        (WebCore::PopupMenu::addOption):
+        * platform/qt/RenderPopupMenuQt.cpp: Removed.
+        * platform/qt/RenderPopupMenuQt.h: Removed.
+        * platform/qt/RenderThemeQt.cpp:
+
 2006-10-13  Kevin McCullough  <KMcCullough@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/platform/qt/FileChooserQt.cpp b/WebCore/platform/qt/FileChooserQt.cpp
index e1da376dbe5ddcc8492a4c1bab474edf8914c4c6..3c6a8ac7e5bb024395a1854412e4055fce0ee219 100644 (file)
--- a/WebCore/platform/qt/FileChooserQt.cpp
+++ b/WebCore/platform/qt/FileChooserQt.cpp
@@ -52,7 +52,7 @@ String FileChooser::basenameForWidth(int width) const
     return String();
 }
 
-void FileChooser::uploadControlDetaching()
+void FileChooser::disconnectUploadControl()
 {
     notImplemented();
 }

diff --git a/WebCore/platform/qt/RenderPopupMenuQt.cpp b/WebCore/platform/qt/RenderPopupMenuQt.cpp
index c8b343386f640fe23ea3a331d694748eeda95481..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/WebCore/platform/qt/RenderPopupMenuQt.cpp
+++ b/WebCore/platform/qt/RenderPopupMenuQt.cpp
@@ -1,78 +0,0 @@
-/*
- * This file is part of the popup menu implementation for <select> elements in WebCore.
- *
- * Copyright (C) 2006 Apple Computer, Inc.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
- * Coypright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-#include "RenderPopupMenuQt.h"
-
-#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
-
-namespace WebCore {
-
-RenderPopupMenuQt::RenderPopupMenuQt(Node* element, RenderMenuList* menuList)
-    : RenderPopupMenu(element, menuList)
-{
-}
-
-RenderPopupMenuQt::~RenderPopupMenuQt()
-{
-}
-
-void RenderPopupMenuQt::clear()
-{
-    notImplemented();
-}
-
-void RenderPopupMenuQt::populate()
-{
-    notImplemented();
-}
-
-void RenderPopupMenuQt::showPopup(const IntRect&, FrameView*, int)
-{
-    notImplemented();
-}
-
-void RenderPopupMenuQt::hidePopup()
-{
-    notImplemented();
-}
-
-void RenderPopupMenuQt::addSeparator()
-{
-    notImplemented();
-}
-
-void RenderPopupMenuQt::addGroupLabel(HTMLOptGroupElement*)
-{
-    notImplemented();
-}
-
-void RenderPopupMenuQt::addOption(HTMLOptionElement*)
-{
-    notImplemented();
-}
-
-}
-
-// vim: ts=4 sw=4 et

diff --git a/WebCore/platform/qt/RenderPopupMenuQt.h b/WebCore/platform/qt/RenderPopupMenuQt.h
index bc657a901dedf42562e68ad1be66436400d392da..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/WebCore/platform/qt/RenderPopupMenuQt.h
+++ b/WebCore/platform/qt/RenderPopupMenuQt.h
@@ -1,54 +0,0 @@
-/*
- * This file is part of the popup menu implementation for <select> elements in WebCore.
- *
- * Copyright (C) 2006 Apple Computer, Inc.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
- * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef RENDER_POPUPMENU_QT_H
-#define RENDER_POPUPMENU_QT_H
-
-#include "RenderPopupMenu.h"
-
-namespace WebCore {
-
-class HTMLOptionElement;
-class HTMLOptGroupElement;
-
-class RenderPopupMenuQt : public RenderPopupMenu {
-public:
-    RenderPopupMenuQt(Node*, RenderMenuList*);
-    ~RenderPopupMenuQt();
-
-    virtual void clear();
-    virtual void populate();
-    virtual void showPopup(const IntRect&, FrameView*, int index);
-    virtual void hidePopup();
-
-protected:
-    virtual void addSeparator();
-    virtual void addGroupLabel(HTMLOptGroupElement*);
-    virtual void addOption(HTMLOptionElement*);
-
-};
-
-}
-
-#endif

diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 2df5b74e427fea1d238d9f0f6ddc2162ad8adea4..72c5cbfa40186d85263040f9ea976203f82cb4b2 100644 (file)
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -33,7 +33,6 @@
 #include "Document.h"
 #include "RenderTheme.h"
 #include "GraphicsContext.h"
-#include "RenderPopupMenuQt.h"
 
 #define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
 
@@ -73,7 +72,6 @@ public:
     virtual bool controlSupportsTints(const RenderObject*) const;
 
     virtual void systemFont(int propId, FontDescription&) const;
-    virtual RenderPopupMenu* createPopupMenu(RenderArena*, Document*, RenderMenuList*);
     
 private:
     void addIntrinsicMargins(RenderStyle*) const;
@@ -118,11 +116,6 @@ void RenderThemeQt::systemFont(int propId, FontDescription& fontDescription) con
     // no-op
 }
 
-RenderPopupMenu* RenderThemeQt::createPopupMenu(RenderArena* arena, Document* doc, RenderMenuList* menuList)
-{
-    return new (arena) RenderPopupMenuQt(doc, menuList);
-}
-
 void RenderThemeQt::addIntrinsicMargins(RenderStyle* style) const
 {
     // Cut out the intrinsic margins completely if we end up using a small font size