diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebKit/wx/bindings | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebKit/wx/bindings')
| -rw-r--r-- | WebKit/wx/bindings/python/samples/simple.py | 6 | ||||
| -rw-r--r-- | WebKit/wx/bindings/python/webview.i | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/WebKit/wx/bindings/python/samples/simple.py b/WebKit/wx/bindings/python/samples/simple.py index 52d4e1b..2756760 100644 --- a/WebKit/wx/bindings/python/samples/simple.py +++ b/WebKit/wx/bindings/python/samples/simple.py @@ -92,11 +92,11 @@ class TestPanel(wx.Panel): def OnStateChanged(self, event): statusbar = self.GetParent().GetStatusBar() if statusbar: - if event.GetState() == wx.webview.WEBVIEW_STATE_NEGOTIATING: + if event.GetState() == wx.webview.WEBVIEW_LOAD_NEGOTIATING: statusbar.SetStatusText("Contacting " + event.GetURL()) - elif event.GetState() == wx.webview.WEBVIEW_STATE_TRANSFERRING: + elif event.GetState() == wx.webview.WEBVIEW_LOAD_TRANSFERRING: statusbar.SetStatusText("Loading " + event.GetURL()) - elif event.GetState() == wx.webview.WEBVIEW_STATE_STOP: + elif event.GetState() == wx.webview.WEBVIEW_LOAD_DOC_COMPLETED: statusbar.SetStatusText("") self.location.SetValue(event.GetURL()) self.GetParent().SetTitle("wxWebView - " + self.webview.GetPageTitle()) diff --git a/WebKit/wx/bindings/python/webview.i b/WebKit/wx/bindings/python/webview.i index 44b38ab..410191a 100644 --- a/WebKit/wx/bindings/python/webview.i +++ b/WebKit/wx/bindings/python/webview.i @@ -28,6 +28,7 @@ %{ #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" +#include "WebFrame.h" #include "WebView.h" #include "WebBrowserShell.h" %} @@ -38,9 +39,11 @@ MAKE_CONST_WXSTRING(WebViewNameStr); +MustHaveApp(wxWebFrame); MustHaveApp(wxWebView); MustHaveApp(wxWebBrowserShell); +%include WebFrame.h %include WebView.h %include WebBrowserShell.h |