avoid deprecated functions with GTK3

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

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index dee0a4c435fb68ab58346a8648beec57a8083eb8..e876aadf0146508dc6a27e352cbba1ec6ab5b565 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        include/wx/osx/webkit.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        include/wx/osx/webkit.h

-// Purpose:     wxOSXWebKitCtrl - embeddable web kit control,
+// Purpose:     wxWebViewWebKit - embeddable web kit control,

 //                             OS X implementation of web view component
 // Author:      Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Modified by:
 //                             OS X implementation of web view component
 // Author:      Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Modified by:


@@ -15,25 +15,25 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__))
-
-// TODO: define this in setup.h ?
-#define wxHAVE_WEB_BACKEND_OSX_WEBKIT 1
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                                          ||  defined(__WXOSX_CARBON__))

 
 #include "wx/control.h"
 #include "wx/webview.h"
 
 
 #include "wx/control.h"
 #include "wx/webview.h"
 

+#include "wx/osx/core/objcid.h"
+

 // ----------------------------------------------------------------------------
 // Web Kit Control
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Web Kit Control
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_WEB wxOSXWebKitCtrl : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView

 {
 public:
 {
 public:

-    wxDECLARE_DYNAMIC_CLASS(wxOSXWebKitCtrl);
+    wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);

 
 

-    wxOSXWebKitCtrl() {}
-    wxOSXWebKitCtrl(wxWindow *parent,
+    wxWebViewWebKit() {}
+    wxWebViewWebKit(wxWindow *parent,

                     wxWindowID winID = wxID_ANY,
                     const wxString& strURL = wxWebViewDefaultURLStr,
                     const wxPoint& pos = wxDefaultPosition,
                     wxWindowID winID = wxID_ANY,
                     const wxString& strURL = wxWebViewDefaultURLStr,
                     const wxPoint& pos = wxDefaultPosition,


@@ -48,57 +48,86 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxString& name = wxWebViewNameStr);
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxString& name = wxWebViewNameStr);

-    virtual ~wxOSXWebKitCtrl();
-
-    void InternalLoadURL(const wxString &url);
+    virtual ~wxWebViewWebKit();

 
 

-    virtual bool CanGoBack();
-    virtual bool CanGoForward();
+    virtual bool CanGoBack() const;
+    virtual bool CanGoForward() const;

     virtual void GoBack();
     virtual void GoForward();
     virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
     virtual void Stop();
     virtual void GoBack();
     virtual void GoForward();
     virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
     virtual void Stop();

-    virtual wxString GetPageSource();
-    virtual void SetPageTitle(const wxString& title) { m_pageTitle = title; }
-    virtual wxString GetPageTitle(){ return m_pageTitle; }
-
-    virtual void SetPage(const wxString& html, const wxString& baseUrl);
+    virtual wxString GetPageSource() const;
+    virtual wxString GetPageText() const;

 
     virtual void Print();
 
 
     virtual void Print();
 

-    virtual void LoadUrl(const wxString& url);
-    virtual wxString GetCurrentURL();
-    virtual wxString GetCurrentTitle();
-    virtual wxWebViewZoom GetZoom();
+    virtual void LoadURL(const wxString& url);
+    virtual wxString GetCurrentURL() const;
+    virtual wxString GetCurrentTitle() const;
+    virtual wxWebViewZoom GetZoom() const;

     virtual void SetZoom(wxWebViewZoom zoom);
 
     virtual void SetZoomType(wxWebViewZoomType zoomType);
     virtual wxWebViewZoomType GetZoomType() const;
     virtual bool CanSetZoomType(wxWebViewZoomType type) const;
 
     virtual void SetZoom(wxWebViewZoom zoom);
 
     virtual void SetZoomType(wxWebViewZoomType zoomType);
     virtual wxWebViewZoomType GetZoomType() const;
     virtual bool CanSetZoomType(wxWebViewZoomType type) const;
 

-    virtual bool IsBusy() { return m_busy; }
+    virtual bool IsBusy() const { return m_busy; }

 
 

-    // ---- methods not from the parent (common) interface
-    wxString GetSelectedText();
+    //History functions
+    virtual void ClearHistory();
+    virtual void EnableHistory(bool enable = true);
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);

 
 

-    wxString RunScript(const wxString& javascript);
+    //Undo / redo functionality
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+    virtual void Undo();
+    virtual void Redo();

 
 

-    bool  CanGetPageSource();
+    //Find function
+    virtual long Find(const wxString& text, int flags = wxWEB_VIEW_FIND_DEFAULT) { return wxNOT_FOUND; };

 
 

-    void  SetScrollPos(int pos);
-    int   GetScrollPos();
+    //Clipboard functions
+    virtual bool CanCut() const { return true; }
+    virtual bool CanCopy() const { return true; }
+    virtual bool CanPaste() const { return true; }
+    virtual void Cut();
+    virtual void Copy();
+    virtual void Paste();
+
+    //Editing functions
+    virtual void SetEditable(bool enable = true);
+    virtual bool IsEditable() const;
+
+    //Selection
+    virtual void DeleteSelection();
+    virtual bool HasSelection() const;
+    virtual void SelectAll();
+    virtual wxString GetSelectedText() const;
+    virtual wxString GetSelectedSource() const;
+    virtual void ClearSelection();

 
 

-    void  MakeEditable(bool enable = true);
-    bool  IsEditable();
+    void RunScript(const wxString& javascript);

 
 

-    wxString GetSelection();
+    //Virtual Filesystem Support
+    virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);

 
 

-    bool  CanIncreaseTextSize();
+    virtual void* GetNativeBackend() const { return m_webView; }
+
+    // ---- methods not from the parent (common) interface
+    bool  CanGetPageSource() const;
+
+    void  SetScrollPos(int pos);
+    int   GetScrollPos();
+
+    bool  CanIncreaseTextSize() const;

     void  IncreaseTextSize();
     void  IncreaseTextSize();

-    bool  CanDecreaseTextSize();
+    bool  CanDecreaseTextSize() const;

     void  DecreaseTextSize();
 
     void  DecreaseTextSize();
 

-    float GetWebkitZoom();
+    float GetWebkitZoom() const;

     void  SetWebkitZoom(float zoom);
 
     // don't hide base class virtuals
     void  SetWebkitZoom(float zoom);
 
     // don't hide base class virtuals


@@ -115,6 +144,8 @@ public:
     bool m_busy;
 
 protected:
     bool m_busy;
 
 protected:

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

     DECLARE_EVENT_TABLE()
     void MacVisibilityChanged();
 
     DECLARE_EVENT_TABLE()
     void MacVisibilityChanged();
 


@@ -123,7 +154,7 @@ private:
     wxWindowID m_windowID;
     wxString m_pageTitle;
 
     wxWindowID m_windowID;
     wxString m_pageTitle;
 

-    struct objc_object *m_webView;
+    wxObjCID m_webView;

 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.


@@ -132,11 +163,6 @@ private:
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 

-
-#else
-// TODO: define this in setup.h ?
-#define wxHAVE_WEB_BACKEND_OSX_WEBKIT 0
-
-#endif // wxUSE_WEBKIT
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT

 
 #endif // _WX_WEBKIT_H_
 
 #endif // _WX_WEBKIT_H_