Remove unused wxNavigationEnabled::AcceptFocus() method.

[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..00ba41eb82bb68405ab790850ed77ec839f5f33b 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -26,7 +26,7 @@ typedef struct _WebKitWebView WebKitWebView;
 class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
 class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:

-    wxWebViewWebKit() { Init(); }
+    wxWebViewWebKit() { }

 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,
 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,


@@ -35,8 +35,6 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {

-        Init();
-

         Create(parent, id, url, pos, size, style, name);
     }
 
         Create(parent, id, url, pos, size, style, name);
     }
 


@@ -47,6 +45,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 +71,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;
 


@@ -97,6 +94,9 @@ public:
     virtual void Undo();
     virtual void Redo();
 
     virtual void Undo();
     virtual void Redo();
 

+    //Find function
+    virtual long Find(const wxString& text, int flags = wxWEB_VIEW_FIND_DEFAULT);
+

     //Editing functions
     virtual void SetEditable(bool enable = true);
     virtual bool IsEditable() const;
     //Editing functions
     virtual void SetEditable(bool enable = true);
     virtual bool IsEditable() const;


@@ -110,14 +110,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 +132,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;
 


@@ -144,6 +143,9 @@ private:
     void SetWebkitZoom(float level);
     float GetWebkitZoom() const;
 
     void SetWebkitZoom(float level);
     float GetWebkitZoom() const;
 

+    //Find helper function
+    void FindClear();
+

     // focus event handler: calls GTKUpdateBitmap()
     void GTKOnFocus(wxFocusEvent& event);
 
     // focus event handler: calls GTKUpdateBitmap()
     void GTKOnFocus(wxFocusEvent& event);
 


@@ -152,6 +154,12 @@ private:
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 

+    //variables used for Find()
+    int m_findFlags;
+    wxString m_findText;
+    int m_findPosition;
+    int m_findCount;
+

     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };