<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50522] trunk/WebKit/wx</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/50522">50522</a></dd>
<dt>Author</dt> <dd>kevino@webkit.org</dd>
<dt>Date</dt> <dd>2009-11-04 11:55:54 -0800 (Wed, 04 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reviewed by Kevin Ollivier.

Fix an assert on shutdown when wxWebView has captured the mouse,
and make sure wxWebView's right click handling is only active when 
the WebCore popup menu is used.
        
https://bugs.webkit.org/show_bug.cgi?id=31131</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitwxChangeLog">trunk/WebKit/wx/ChangeLog</a></li>
<li><a href="#trunkWebKitwxWebViewcpp">trunk/WebKit/wx/WebView.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitwxChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/ChangeLog (50521 => 50522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/ChangeLog        2009-11-04 19:35:04 UTC (rev 50521)
+++ trunk/WebKit/wx/ChangeLog        2009-11-04 19:55:54 UTC (rev 50522)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2009-11-04  Kevin Watters  &lt;kevinwatters@gmail.com&gt;
+
+        Reviewed by Kevin Ollivier.
+
+        Fix an assert on shutdown when wxWebView has captured the mouse,
+        and make sure wxWebView's right click handling is only active when 
+        the WebCore popup menu is used.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=31131
+
+        * WebView.cpp:
+        (wxWebView::~wxWebView):
+        (wxWebView::OnContextMenuEvents):
+        (wxWebView::OnMenuSelectEvents):
+
</ins><span class="cx"> 2009-11-04  Vadim Zeitlin  &lt;vadim@wxwidgets.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Eric Seidel.
</span></span></pre></div>
<a id="trunkWebKitwxWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/WebView.cpp (50521 => 50522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/WebView.cpp        2009-11-04 19:35:04 UTC (rev 50521)
+++ trunk/WebKit/wx/WebView.cpp        2009-11-04 19:55:54 UTC (rev 50522)
</span><span class="lines">@@ -257,7 +257,6 @@
</span><span class="cx">     EVT_SIZE(wxWebView::OnSize)
</span><span class="cx">     EVT_MOUSE_EVENTS(wxWebView::OnMouseEvents)
</span><span class="cx">     EVT_CONTEXT_MENU(wxWebView::OnContextMenuEvents)
</span><del>-    EVT_MENU(wxID_ANY, wxWebView::OnMenuSelectEvents)
</del><span class="cx">     EVT_KEY_DOWN(wxWebView::OnKeyEvents)
</span><span class="cx">     EVT_KEY_UP(wxWebView::OnKeyEvents)
</span><span class="cx">     EVT_CHAR(wxWebView::OnKeyEvents)
</span><span class="lines">@@ -348,6 +347,9 @@
</span><span class="cx"> {
</span><span class="cx">     m_beingDestroyed = true;
</span><span class="cx">     
</span><ins>+    while (HasCapture())
+        ReleaseMouse();
+    
</ins><span class="cx">     if (m_mainFrame &amp;&amp; m_mainFrame-&gt;GetFrame())
</span><span class="cx">         m_mainFrame-&gt;GetFrame()-&gt;loader()-&gt;detachFromParent();
</span><span class="cx">     
</span><span class="lines">@@ -646,6 +648,7 @@
</span><span class="cx"> 
</span><span class="cx"> void wxWebView::OnContextMenuEvents(wxContextMenuEvent&amp; event)
</span><span class="cx"> {
</span><ins>+    Connect(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(wxWebView::OnMenuSelectEvents), NULL, this);
</ins><span class="cx">     m_impl-&gt;page-&gt;contextMenuController()-&gt;clearContextMenu();
</span><span class="cx">     wxPoint localEventPoint = ScreenToClient(event.GetPosition());
</span><span class="cx"> 
</span><span class="lines">@@ -675,10 +678,18 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     PopupMenu(menuWx, localEventPoint);
</span><ins>+    
+    Disconnect(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(wxWebView::OnMenuSelectEvents), NULL, this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void wxWebView::OnMenuSelectEvents(wxCommandEvent&amp; event)
</span><span class="cx"> {
</span><ins>+    // we shouldn't hit this unless there's a context menu showing
+    WebCore::ContextMenu* coreMenu = m_impl-&gt;page-&gt;contextMenuController()-&gt;contextMenu();
+    ASSERT(coreMenu);
+    if (!coreMenu)
+        return;
+
</ins><span class="cx">     WebCore::ContextMenuItem* item = WebCore::ContextMenu::itemWithId (event.GetId());
</span><span class="cx">     if (!item)
</span><span class="cx">         return;
</span></span></pre>
</div>
</div>

</body>
</html>