Commit 9e6072c5 authored by kevino@webkit.org's avatar kevino@webkit.org

Reviewed by Kevin Ollivier.

Implement popup menu support for wx port.
        
https://bugs.webkit.org/show_bug.cgi?id=18776


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32800 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 23964003
2008-05-01 Robin Dunn <robin@alldunn.com>
Reviewed by Kevin Ollivier.
Implement popup menu support for wx port.
https://bugs.webkit.org/show_bug.cgi?id=18776
* platform/PopupMenu.h:
* platform/wx/PopupMenuWx.cpp: Added.
(WebCore::PopupMenu::PopupMenu):
(WebCore::PopupMenu::~PopupMenu):
(WebCore::PopupMenu::show):
(WebCore::PopupMenu::OnMenuItemSelected):
(WebCore::PopupMenu::hide):
(WebCore::PopupMenu::updateFromElement):
(WebCore::PopupMenu::itemWritingDirectionIsNatural):
* platform/wx/TemporaryLinkStubs.cpp:
* webcore-wx.bkl:
2008-05-01 Kevin Ollivier <kevino@theolliviers.com>
Reviewed by Eric Seidel.
......@@ -50,6 +50,13 @@ typedef struct _GtkMenuItem GtkMenuItem;
typedef struct _GtkWidget GtkWidget;
#include <wtf/HashMap.h>
#include <glib.h>
#elif PLATFORM(WX)
#ifdef __WXMSW__
#include <wx/msw/winundef.h>
#endif
class wxMenu;
#include <wx/defs.h>
#include <wx/event.h>
#endif
namespace WebCore {
......@@ -61,6 +68,9 @@ class PopupMenu : public RefCounted<PopupMenu>
#if PLATFORM(WIN)
, private ScrollbarClient
#endif
#if PLATFORM(WX)
, public wxEvtHandler
#endif
{
public:
static PassRefPtr<PopupMenu> create(PopupMenuClient* client) { return new PopupMenu(client); }
......@@ -161,6 +171,9 @@ private:
static void menuUnmapped(GtkWidget*, PopupMenu*);
static void menuPositionFunction(GtkMenu*, gint*, gint*, gboolean*, PopupMenu*);
static void menuRemoveItem(GtkWidget*, PopupMenu*);
#elif PLATFORM(WX)
wxMenu* m_menu;
void OnMenuItemSelected(wxCommandEvent&);
#endif
};
......
/*
* This file is part of the popup menu implementation for <select> elements in WebCore.
*
* Copyright (C) 2008 Apple Computer, Inc.
*
* 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., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
*/
#include "config.h"
#include "PopupMenu.h"
#include "Frame.h"
#include "FrameView.h"
#include "NotImplemented.h"
#include "PopupMenuClient.h"
#include "PlatformString.h"
#include <wx/defs.h>
#include <wx/event.h>
#include <wx/menu.h>
static int s_menuStartId = wxNewId();
namespace WebCore {
PopupMenu::PopupMenu(PopupMenuClient* client)
: RefCounted<PopupMenu>(0)
, m_popupClient(client)
, m_menu(NULL)
{
}
PopupMenu::~PopupMenu()
{
delete m_menu;
}
void PopupMenu::show(const IntRect& r, FrameView* v, int index)
{
// just delete and recreate
delete m_menu;
ASSERT(client());
wxWindow* nativeWin = v->nativeWindow();
if (nativeWin) {
// construct the menu
m_menu = new wxMenu();
int size = client()->listSize();
for (int i = 0; i < size; i++) {
int id = s_menuStartId + i;
if (client()->itemIsSeparator(i)) {
m_menu->AppendSeparator();
}
else {
// FIXME: appending a menu item with an empty label asserts in
// wx. This needs to be fixed at wx level so that we can have
// the concept of "no selection" in choice boxes, etc.
if (!client()->itemText(i).isEmpty())
m_menu->Append(s_menuStartId + i, client()->itemText(i));
}
}
nativeWin->Connect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenu::OnMenuItemSelected), NULL, this);
nativeWin->PopupMenu(m_menu, r.x() - v->contentsX(), r.y() - v->contentsY());
nativeWin->Disconnect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenu::OnMenuItemSelected), NULL, this);
}
}
void PopupMenu::OnMenuItemSelected(wxCommandEvent& event)
{
if (client())
client()->valueChanged(event.GetId() - s_menuStartId);
// TODO: Do we need to call Disconnect here? Do we have a ref to the native window still?
}
void PopupMenu::hide()
{
notImplemented();
}
void PopupMenu::updateFromElement()
{
client()->setTextFromItem(m_popupClient->selectedIndex());
}
bool PopupMenu::itemWritingDirectionIsNatural()
{
return false;
}
}
......@@ -158,14 +158,6 @@ void PlatformScrollbar::setRect(const IntRect&) { notImplemented(); }
void FileChooser::openFileChooser(Document*) { notImplemented(); }
String FileChooser::basenameForWidth(const Font&, int width) const { notImplemented(); return String(); }
PopupMenu::PopupMenu(PopupMenuClient*) : RefCounted<PopupMenu>(0) { notImplemented(); }
PopupMenu::~PopupMenu() { notImplemented(); }
void PopupMenu::show(const IntRect&, FrameView*, int index) { notImplemented(); }
void PopupMenu::hide() { notImplemented(); }
void PopupMenu::updateFromElement() { notImplemented(); }
bool PopupMenu::itemWritingDirectionIsNatural() { notImplemented(); return false; }
Icon::Icon() : RefCounted<Icon>(0) { notImplemented(); }
Icon::~Icon() { notImplemented(); }
PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); }
......
......@@ -68,6 +68,7 @@ wxWebCore port Bakefile project file.
platform/wx/DragDataWx.cpp
platform/wx/DragImageWx.cpp
platform/wx/FileSystemWx.cpp
platform/wx/PopupMenuWx.cpp
platform/graphics/wx/FontCacheWx.cpp
platform/graphics/wx/FontPlatformDataWx.cpp
platform/graphics/wx/FontWx.cpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment