adding SetLabel -> SetTitle redirects, solves missing title updates using wxDocument...

[wxWidgets.git] / include / wx / gtk / webview_webkit.h

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index d72a398b61834223b676f2b3de68803b1f66b222..d130b827e362ae3932b62d0791eeb9722f9be72d 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -47,6 +47,8 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr);
 
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr);
 

+    virtual ~wxWebViewWebKit();
+

     virtual bool Enable( bool enable = true );
 
     // implementation
     virtual bool Enable( bool enable = true );
 
     // implementation


@@ -71,9 +73,6 @@ public:
     virtual wxString GetCurrentTitle() const;
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;
     virtual wxString GetCurrentTitle() const;
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;

-    //We do not want to hide the other overloads
-    using wxWebView::SetPage;
-    virtual void SetPage(const wxString& html, const wxString& baseUrl);

     virtual void Print();
     virtual bool IsBusy() const;
 
     virtual void Print();
     virtual bool IsBusy() const;
 


@@ -110,14 +109,12 @@ public:
     virtual void ClearSelection();
 
     virtual void RunScript(const wxString& javascript);
     virtual void ClearSelection();
 
     virtual void RunScript(const wxString& javascript);

-    
+

     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
     virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
 
     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
     virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
 

-    /** FIXME: hack to work around signals being received too early */
-    bool m_ready;
-
+    virtual void* GetNativeBackend() const { return m_web_view; }

 
     /** TODO: check if this can be made private
      * The native control has a getter to check for busy state, but except in
 
     /** TODO: check if this can be made private
      * The native control has a getter to check for busy state, but except in


@@ -134,6 +131,7 @@ public:
     bool m_guard;
 
 protected:
     bool m_guard;
 
 protected:

+    virtual void DoSetPage(const wxString& html, const wxString& baseUrl);

 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;