Changeset 86068 in webkit

Timestamp:

May 9, 2011 11:14:46 AM (13 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

Create empty event handler to avoid new mouse capture assert added in wx 2.9 on wxMSW.

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

Location:

trunk/Source/WebKit/wx

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (2 diffs)
• WebView.h (modified) (1 diff)

trunk/Source/WebKit/wx/ChangeLog

@@ +1 @@
+2011-05-09  Robin Dunn  <robin@alldunn.com>
+
+        Reviewed by Kevin Ollivier.
+
+        Create empty event handler to avoid new mouse capture assert added in wx 2.9 on wxMSW.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=60480
+
+        * WebView.cpp:
+        (wxWebView::OnMouseCaptureLost):
+        * WebView.h:
+
 2011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/wx/WebView.cpp

@@ -321 +321 @@
     EVT_SET_FOCUS(wxWebView::OnSetFocus)
     EVT_KILL_FOCUS(wxWebView::OnKillFocus)
+    EVT_MOUSE_CAPTURE_LOST(wxWebView::OnMouseCaptureLost)
 END_EVENT_TABLE()
 
@@ -842 +843 @@
     m_impl->page->contextMenuController()->contextMenuItemSelected(item);
     delete item;
+}
+
+void wxWebView::OnMouseCaptureLost(wxMouseCaptureLostEvent& event)
+{
+    // do nothing - unfortunately, we MUST handle this event due to wxWidgets rules,
+    // otherwise we will assert, even though there is nothing for us to do here.
 }
 

trunk/Source/WebKit/wx/WebView.h

@@ -242 +242 @@
     void OnKillFocus(wxFocusEvent& event);
     void OnTLWActivated(wxActivateEvent& event);
+    void OnMouseCaptureLost(wxMouseCaptureLostEvent&);
     
 private: