Changeset 34183 in webkit

Timestamp:

May 28, 2008 1:57:52 PM (16 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

This patch adds a new wx event type and code to send it when a new title is set by the page being loaded.

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

Location:

trunk/WebKit/wx

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/FrameLoaderClientWx.cpp (modified) (1 diff)
• WebView.cpp (modified) (1 diff)
• WebView.h (modified) (4 diffs)
• bindings/python/webview.i (modified) (2 diffs)

trunk/WebKit/wx/ChangeLog

@@ +1 @@
+2008-05-28  Robin Dunn  <robin@alldunn.com>
+
+        Reviewed by Kevin Ollivier.
+
+        This patch adds a new wx event type and code to send it when a new title is set
+        by the page being loaded.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=19067
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::dispatchDidReceiveTitle):
+        * WebView.cpp:
+        (wxWebViewReceivedTitleEvent::wxWebViewReceivedTitleEvent):
+        * WebView.h:
+        * bindings/python/webview.i:
+
 2008-05-28  Robin Dunn  <robin@alldunn.com>
 

trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

@@ -311 +311 @@
 void FrameLoaderClientWx::dispatchDidReceiveTitle(const String& title)
 {
-    if (m_webView)
+    if (m_webView) {
         m_webView->SetPageTitle(title);
+        wxWebViewReceivedTitleEvent wkEvent(m_webView);
+        wkEvent.SetTitle(title);
+        m_webView->GetEventHandler()->ProcessEvent(wkEvent);
+    }
 }
 

trunk/WebKit/wx/WebView.cpp

@@ -151 +151 @@
 }
 
+IMPLEMENT_DYNAMIC_CLASS(wxWebViewReceivedTitleEvent, wxCommandEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_WEBVIEW_RECEIVED_TITLE)
+
+wxWebViewReceivedTitleEvent::wxWebViewReceivedTitleEvent(wxWindow* win)
+{
+    SetEventType(wxEVT_WEBVIEW_RECEIVED_TITLE);
+    SetEventObject(win);
+    if (win)
+        SetId(win->GetId());
+}
+
 //---------------------------------------------------------
 // DOM Element info data type

trunk/WebKit/wx/WebView.h

@@ -324 +324 @@
 };
 
+class WXDLLIMPEXP_WEBKIT wxWebViewReceivedTitleEvent : public wxCommandEvent
+{
+#ifndef SWIG
+    DECLARE_DYNAMIC_CLASS( wxWebViewReceivedTitleEvent )
+#endif
+
+public:
+    wxString GetTitle() const { return m_title; }
+    void SetTitle(const wxString& title) { m_title = title; }
+
+    wxWebViewReceivedTitleEvent( wxWindow* win = static_cast<wxWindow*>(NULL));
+    wxEvent *Clone(void) const { return new wxWebViewReceivedTitleEvent(*this); }
+
+private:
+    wxString m_title;
+};
+
+
 typedef void (wxEvtHandler::*wxWebViewLoadEventFunction)(wxWebViewLoadEvent&);
 typedef void (wxEvtHandler::*wxWebViewBeforeLoadEventFunction)(wxWebViewBeforeLoadEvent&);
@@ -329 +347 @@
 typedef void (wxEvtHandler::*wxWebViewRightClickEventFunction)(wxWebViewRightClickEvent&);
 typedef void (wxEvtHandler::*wxWebViewConsoleMessageEventFunction)(wxWebViewConsoleMessageEvent&);
+typedef void (wxEvtHandler::*wxWebViewReceivedTitleEventFunction)(wxWebViewReceivedTitleEvent&);
 
 #ifndef SWIG
@@ -337 +356 @@
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WEBKIT, wxEVT_WEBVIEW_RIGHT_CLICK, wxID_ANY)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WEBKIT, wxEVT_WEBVIEW_CONSOLE_MESSAGE, wxID_ANY)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WEBKIT, wxEVT_WEBVIEW_RECEIVED_TITLE, wxID_ANY)
 END_DECLARE_EVENT_TYPES()
 #endif
@@ -380 +400 @@
                             static_cast<wxObject*>(NULL)),
 
+#define EVT_WEBVIEW_RECEIVED_TITLE(winid, func)                       \
+            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBVIEW_RECEIVED_TITLE, \
+                            winid, \
+                            wxID_ANY, \
+                            (wxObjectEventFunction)   \
+                            (wxWebViewReceivedTitleEventFunction) & func, \
+                            static_cast<wxObject*>(NULL)),
+
 #endif // ifndef WXWEBVIEW_H

trunk/WebKit/wx/bindings/python/webview.i

@@ -49 +49 @@
 %constant wxEventType wxEVT_WEBVIEW_RIGHT_CLICK;
 %constant wxEventType wxEVT_WEBVIEW_CONSOLE_MESSAGE;
+%constant wxEventType wxEVT_WEBVIEW_RECEIVED_TITLE;
 
 %pythoncode {
@@ -56 +57 @@
 EVT_WEBVIEW_RIGHT_CLICK = wx.PyEventBinder( wxEVT_WEBVIEW_RIGHT_CLICK, 1 )
 EVT_WEBVIEW_CONSOLE_MESSAGE = wx.PyEventBinder( wxEVT_WEBVIEW_CONSOLE_MESSAGE, 1 )
+EVT_WEBVIEW_RECEIVED_TITLE = wx.PyEventBinder( wxEVT_WEBVIEW_RECEIVED_TITLE, 1 )    
 }