Changeset 33957 in webkit

Timestamp:

May 20, 2008 10:47:44 PM (16 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Darin Adler.

Rename wxWebFrame -> wxWebBrowserShell in preparation to introduce a WebFrame counterpart in wx port. (Frame typically means 'top level window' in wx terms.)

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

Location:

trunk/WebKit/wx

Files:

• ChangeLog (modified) (1 diff)
• WebBrowserShell.cpp (moved) (moved from trunk/WebKit/wx/WebFrame.cpp) (21 diffs)
• WebBrowserShell.h (moved) (moved from trunk/WebKit/wx/WebFrame.h) (3 diffs)
• WebKitSupport/ChromeClientWx.cpp (modified) (2 diffs)
• bindings/python/webview.i (modified) (2 diffs)
• wxwebkit.bkl (modified) (1 diff)

trunk/WebKit/wx/ChangeLog

@@ +1 @@
+2008-05-16  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Reviewed by Darin Adler.
+        
+        Rename wxWebFrame -> wxWebBrowserShell in preparation to introduce a WebFrame
+        counterpart in wx port. (Frame typically means 'top level window' in wx terms.)
+        
+        https://bugs.webkit.org/show_bug.cgi?id=19041
+
+        * WebBrowserShell.cpp: Copied from WebKit/wx/WebFrame.cpp.
+        (wxWebBrowserShell::wxWebBrowserShell):
+        (wxWebBrowserShell::~wxWebBrowserShell):
+        (wxWebBrowserShell::ShowDebugMenu):
+        (wxWebBrowserShell::OnQuit):
+        (wxWebBrowserShell::OnAbout):
+        (wxWebBrowserShell::OnLoadFile):
+        (wxWebBrowserShell::OnLoadEvent):
+        (wxWebBrowserShell::OnBeforeLoad):
+        (wxWebBrowserShell::OnAddressBarEnter):
+        (wxWebBrowserShell::OnSearchCtrlEnter):
+        (wxWebBrowserShell::OnBack):
+        (wxWebBrowserShell::OnForward):
+        (wxWebBrowserShell::OnStop):
+        (wxWebBrowserShell::OnReload):
+        (wxWebBrowserShell::OnMakeTextLarger):
+        (wxWebBrowserShell::OnMakeTextSmaller):
+        (wxWebBrowserShell::OnGetSource):
+        (wxWebBrowserShell::OnSetSource):
+        (wxWebBrowserShell::OnBrowse):
+        (wxWebBrowserShell::OnEdit):
+        (wxWebBrowserShell::OnRunScript):
+        * WebBrowserShell.h: Copied from WebKit/wx/WebFrame.h.
+        * WebFrame.cpp: Removed.
+        * WebFrame.h: Removed.
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::createWindow):
+        * bindings/python/webview.i:
+        * wxwebkit.bkl:
+
 2008-05-20  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKit/wx/WebBrowserShell.cpp

@@ -37 +37 @@
 
 #include "WebView.h"
-#include "WebFrame.h"
+#include "WebBrowserShell.h"
 #include "WebViewPrivate.h"
 
@@ -67 +67 @@
 };
 
-BEGIN_EVENT_TABLE(wxWebFrame, wxFrame)
-    EVT_MENU(wxID_EXIT,  wxWebFrame::OnQuit)
-    EVT_MENU(wxID_ABOUT, wxWebFrame::OnAbout)
-    EVT_MENU(ID_LOADFILE, wxWebFrame::OnLoadFile)
-    EVT_TEXT_ENTER(ID_TEXTCTRL, wxWebFrame::OnAddressBarEnter)
-    EVT_TEXT_ENTER(ID_SEARCHCTRL, wxWebFrame::OnSearchCtrlEnter)
-    EVT_WEBVIEW_LOAD(ID_WEBVIEW, wxWebFrame::OnLoadEvent)
-    EVT_WEBVIEW_BEFORE_LOAD(ID_WEBVIEW, wxWebFrame::OnBeforeLoad)
-    EVT_MENU(ID_BACK, wxWebFrame::OnBack)
-    EVT_MENU(ID_FORWARD, wxWebFrame::OnForward)
-    EVT_MENU(ID_STOP, wxWebFrame::OnStop)
-    EVT_MENU(ID_RELOAD, wxWebFrame::OnReload)
-    EVT_MENU(ID_MAKE_TEXT_LARGER, wxWebFrame::OnMakeTextLarger)
-    EVT_MENU(ID_MAKE_TEXT_SMALLER, wxWebFrame::OnMakeTextSmaller)
-    EVT_MENU(ID_GET_SOURCE, wxWebFrame::OnGetSource)
-    EVT_MENU(ID_SET_SOURCE, wxWebFrame::OnSetSource)
-    EVT_MENU(ID_BROWSE, wxWebFrame::OnBrowse)
-    EVT_MENU(ID_EDIT, wxWebFrame::OnEdit)
-    EVT_MENU(ID_RUN_SCRIPT, wxWebFrame::OnRunScript)
+BEGIN_EVENT_TABLE(wxWebBrowserShell, wxFrame)
+    EVT_MENU(wxID_EXIT,  wxWebBrowserShell::OnQuit)
+    EVT_MENU(wxID_ABOUT, wxWebBrowserShell::OnAbout)
+    EVT_MENU(ID_LOADFILE, wxWebBrowserShell::OnLoadFile)
+    EVT_TEXT_ENTER(ID_TEXTCTRL, wxWebBrowserShell::OnAddressBarEnter)
+    EVT_TEXT_ENTER(ID_SEARCHCTRL, wxWebBrowserShell::OnSearchCtrlEnter)
+    EVT_WEBVIEW_LOAD(ID_WEBVIEW, wxWebBrowserShell::OnLoadEvent)
+    EVT_WEBVIEW_BEFORE_LOAD(ID_WEBVIEW, wxWebBrowserShell::OnBeforeLoad)
+    EVT_MENU(ID_BACK, wxWebBrowserShell::OnBack)
+    EVT_MENU(ID_FORWARD, wxWebBrowserShell::OnForward)
+    EVT_MENU(ID_STOP, wxWebBrowserShell::OnStop)
+    EVT_MENU(ID_RELOAD, wxWebBrowserShell::OnReload)
+    EVT_MENU(ID_MAKE_TEXT_LARGER, wxWebBrowserShell::OnMakeTextLarger)
+    EVT_MENU(ID_MAKE_TEXT_SMALLER, wxWebBrowserShell::OnMakeTextSmaller)
+    EVT_MENU(ID_GET_SOURCE, wxWebBrowserShell::OnGetSource)
+    EVT_MENU(ID_SET_SOURCE, wxWebBrowserShell::OnSetSource)
+    EVT_MENU(ID_BROWSE, wxWebBrowserShell::OnBrowse)
+    EVT_MENU(ID_EDIT, wxWebBrowserShell::OnEdit)
+    EVT_MENU(ID_RUN_SCRIPT, wxWebBrowserShell::OnRunScript)
 END_EVENT_TABLE()
 
 
-wxWebFrame::wxWebFrame(const wxString& title) : 
+wxWebBrowserShell::wxWebBrowserShell(const wxString& title) : 
         wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(600, 500)),
         m_checkBeforeLoad(false)
@@ -162 +162 @@
 }
 
-wxWebFrame::~wxWebFrame()
+wxWebBrowserShell::~wxWebBrowserShell()
 {
     if (m_debugMenu && GetMenuBar()->FindMenu(_("&Debug")) == wxNOT_FOUND)
@@ -168 +168 @@
 }
 
-void wxWebFrame::ShowDebugMenu(bool show)
+void wxWebBrowserShell::ShowDebugMenu(bool show)
 {
     int debugMenu = GetMenuBar()->FindMenu(_("&Debug"));
@@ -183 +183 @@
 // event handlers
 
-void wxWebFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+void wxWebBrowserShell::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     // true is to force the frame to close
@@ -189 +189 @@
 }
 
-void wxWebFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+void wxWebBrowserShell::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
@@ -199 +199 @@
 }
 
-void wxWebFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
+void wxWebBrowserShell::OnLoadFile(wxCommandEvent& WXUNUSED(event))
 {
     wxFileDialog* dialog = new wxFileDialog(this, wxT("Choose a file"));
@@ -210 +210 @@
 }
 
-void wxWebFrame::OnLoadEvent(wxWebViewLoadEvent& event)
+void wxWebBrowserShell::OnLoadEvent(wxWebViewLoadEvent& event)
 {
     if (GetStatusBar() != NULL){
@@ -230 +230 @@
 }
 
-void wxWebFrame::OnBeforeLoad(wxWebViewBeforeLoadEvent& myEvent)
+void wxWebBrowserShell::OnBeforeLoad(wxWebViewBeforeLoadEvent& myEvent)
 {
     if (m_checkBeforeLoad) {
@@ -240 +240 @@
 }
 
-void wxWebFrame::OnAddressBarEnter(wxCommandEvent& event)
+void wxWebBrowserShell::OnAddressBarEnter(wxCommandEvent& event)
 {
     if (webview)
@@ -246 +246 @@
 }
 
-void wxWebFrame::OnSearchCtrlEnter(wxCommandEvent& event)
+void wxWebBrowserShell::OnSearchCtrlEnter(wxCommandEvent& event)
 {
     if (webview) {
@@ -253 +253 @@
 }
 
-void wxWebFrame::OnBack(wxCommandEvent& event)
+void wxWebBrowserShell::OnBack(wxCommandEvent& event)
 {
     if (webview)
@@ -259 +259 @@
 }
 
-void wxWebFrame::OnForward(wxCommandEvent& event)
+void wxWebBrowserShell::OnForward(wxCommandEvent& event)
 {
     if (webview)
@@ -265 +265 @@
 }
 
-void wxWebFrame::OnStop(wxCommandEvent& myEvent)
+void wxWebBrowserShell::OnStop(wxCommandEvent& myEvent)
 {
     if (webview)
@@ -271 +271 @@
 }
 
-void wxWebFrame::OnReload(wxCommandEvent& myEvent)
+void wxWebBrowserShell::OnReload(wxCommandEvent& myEvent)
 {
     if (webview)
@@ -277 +277 @@
 }
 
-void wxWebFrame::OnMakeTextLarger(wxCommandEvent& myEvent)
+void wxWebBrowserShell::OnMakeTextLarger(wxCommandEvent& myEvent)
 {
     if (webview) {
@@ -285 +285 @@
 }
 
-void wxWebFrame::OnMakeTextSmaller(wxCommandEvent& myEvent)
+void wxWebBrowserShell::OnMakeTextSmaller(wxCommandEvent& myEvent)
 {
     if (webview) {
@@ -293 +293 @@
 }
 
-void wxWebFrame::OnGetSource(wxCommandEvent& myEvent)
-{
-    if (webview) {
-        wxPageSourceViewFrame* wxWebFrame = new wxPageSourceViewFrame(webview->GetPageSource());
-        wxWebFrame->Show();
-    }
-}
-
-void wxWebFrame::OnSetSource(wxCommandEvent& event)
+void wxWebBrowserShell::OnGetSource(wxCommandEvent& myEvent)
+{
+    if (webview) {
+        wxPageSourceViewFrame* pageSourceFrame = new wxPageSourceViewFrame(webview->GetPageSource());
+        pageSourceFrame->Show();
+    }
+}
+
+void wxWebBrowserShell::OnSetSource(wxCommandEvent& event)
 {
     if (webview)
@@ -307 +307 @@
 }
 
-void wxWebFrame::OnBrowse(wxCommandEvent& event)
+void wxWebBrowserShell::OnBrowse(wxCommandEvent& event)
 {
     if (webview)
@@ -313 +313 @@
 }
 
-void wxWebFrame::OnEdit(wxCommandEvent& event)
+void wxWebBrowserShell::OnEdit(wxCommandEvent& event)
 {
     if (webview)
@@ -319 +319 @@
 }
 
-void wxWebFrame::OnRunScript(wxCommandEvent& myEvent){
+void wxWebBrowserShell::OnRunScript(wxCommandEvent& myEvent){
     if (webview) {
         wxTextEntryDialog* dialog = new wxTextEntryDialog(this, _("Type in a JavaScript to exectute."));

trunk/WebKit/wx/WebBrowserShell.h

@@ -26 +26 @@
  */
  
-#ifndef WXWEBFRAME_H
-#define WXWEBFRAME_H
+#ifndef WXWEBBROWSERSHELL_H
+#define WXWEBBROWSERSHELL_H
 
 #include "wx/wxprec.h"
@@ -37 +37 @@
 #include <wx/srchctrl.h>
 
-class WXDLLIMPEXP_WEBKIT wxWebFrame : public wxFrame
+class WXDLLIMPEXP_WEBKIT wxWebBrowserShell : public wxFrame
 {
 public:
     // ctor(s)
 #if SWIG
-    %pythonAppend wxWebFrame "self._setOORInfo(self)"
+    %pythonAppend wxWebBrowserShell "self._setOORInfo(self)"
 #endif
-    wxWebFrame(const wxString& title);
+    wxWebBrowserShell(const wxString& title);
 
 #ifndef SWIG
-    ~wxWebFrame();
+    ~wxWebBrowserShell();
 #endif
 
@@ -96 +96 @@
 };
 
-#endif // ifndef WXWEBFRAME_H
+#endif // ifndef WXWEBBROWSERSHELL_H

trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

@@ -41 +41 @@
 #include <wx/textdlg.h>
 
-#include "WebFrame.h"
+#include "WebBrowserShell.h"
 #include "WebView.h"
 #include "WebViewPrivate.h"
@@ -113 +113 @@
     
     Page* myPage = 0;
-    wxWebFrame* newFrame = new wxWebFrame(wxTheApp->GetAppName());
+    wxWebBrowserShell* newFrame = new wxWebBrowserShell(wxTheApp->GetAppName());
     
     if (newFrame->webview) {

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

@@ -30 +30 @@
 #include "wx/wxPython/pyclasses.h"
 #include "WebView.h"
-#include "WebFrame.h"
+#include "WebBrowserShell.h"
 %}
 
@@ -39 +39 @@
 
 MustHaveApp(wxWebView);
-MustHaveApp(wxWebFrame);
+MustHaveApp(wxWebBrowserShell);
 
 %include WebView.h
-%include WebFrame.h
+%include WebBrowserShell.h
 
 %constant wxEventType wxEVT_WEBVIEW_BEFORE_LOAD;

trunk/WebKit/wx/wxwebkit.bkl

@@ -76 +76 @@
             
             WebView.cpp
-            WebFrame.cpp
+            WebBrowserShell.cpp
         </sources>   
     </dll>