Changeset 86071 in webkit

Timestamp:

May 9, 2011 11:23:24 AM (13 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

[wx] Update the popup menu code to grab the native control and initialize the
event handler properly.

​https://bugs.webkit.org/show_bug.cgi?id=60482

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/wx/PopupMenuWx.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-09  Robin Dunn  <robin@alldunn.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] Update the popup menu code to grab the native control and initialize the
+        event handler properly.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=60482
+
+        * platform/wx/PopupMenuWx.cpp:
+        (WebCore::PopupMenuWx::PopupMenuWx):
+        (WebCore::PopupMenuWx::~PopupMenuWx):
+        (WebCore::PopupMenuWx::show):
+
 2011-05-09  Robin Dunn  <robin@alldunn.com>
 

trunk/Source/WebCore/platform/wx/PopupMenuWx.cpp

@@ -27 +27 @@
 #include "Frame.h"
 #include "FrameView.h"
+#include "HostWindow.h"
 #include "PopupMenuClient.h"
 #include "PlatformString.h"
@@ -66 +67 @@
     , m_menu(0)
 {
-    PopupMenuEventHandler m_popupHandler(client);
+    m_popupHandler = new PopupMenuEventHandler(client);
 }
 
 PopupMenuWx::~PopupMenuWx()
 {
+    delete m_popupHandler;
     delete m_menu;
 }
@@ -84 +86 @@
     delete m_menu;
     ASSERT(client());
+    ASSERT(v);
 
-    wxWindow* nativeWin = v->platformWidget();
+    wxWindow* nativeWin = v->hostWindow()->platformPageClient();
 
     if (nativeWin) {