X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c13d6ac1ea199d1e3908d40d129e2fd5a4d82df7..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/osx/webview_webkit.h?ds=sidebyside

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index ecdd7a808b..7fea5243a7 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -15,8 +15,8 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
-                         ||  defined(__WXOSX_CARBON__))
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                                          ||  defined(__WXOSX_CARBON__))
 
 #include "wx/control.h"
 #include "wx/webview.h"
@@ -25,10 +25,7 @@
 // Web Kit Control
 // ----------------------------------------------------------------------------
 
-class wxMacControl;
-class wxWidgetCocoaImpl;
-
-class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
@@ -51,14 +48,14 @@ public:
                 const wxString& name = wxWebViewNameStr);
     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 wxString GetPageSource();
-    virtual wxString GetPageText();
+    virtual wxString GetPageSource() const;
+    virtual wxString GetPageText() const;
 
     //We do not want to hide the other overloads
     using wxWebView::SetPage;
@@ -66,17 +63,17 @@ public:
 
     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 bool IsBusy() { return m_busy; }
+    virtual bool IsBusy() const { return m_busy; }
     
     //History functions
     virtual void ClearHistory();
@@ -86,29 +83,29 @@ public:
     virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
     
     //Undo / redo functionality
-    virtual bool CanUndo();
-    virtual bool CanRedo();
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
     virtual void Undo();
     virtual void Redo();
 
     //Clipboard functions
-    virtual bool CanCut() { return false; }
-    virtual bool CanCopy() { return false; }
-    virtual bool CanPaste() { return false; }
+    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();
+    virtual bool IsEditable() const;
     
     //Selection
     virtual void DeleteSelection();
-    virtual bool HasSelection();
+    virtual bool HasSelection() const;
     virtual void SelectAll();
-    virtual wxString GetSelectedText();
-    virtual wxString GetSelectedSource();
+    virtual wxString GetSelectedText() const;
+    virtual wxString GetSelectedSource() const;
     virtual void ClearSelection();
     
     void RunScript(const wxString& javascript);
@@ -117,17 +114,17 @@ public:
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
 
     // ---- methods not from the parent (common) interface
-    bool  CanGetPageSource();
+    bool  CanGetPageSource() const;
 
     void  SetScrollPos(int pos);
     int   GetScrollPos();
 
-    bool  CanIncreaseTextSize();
+    bool  CanIncreaseTextSize() const;
     void  IncreaseTextSize();
-    bool  CanDecreaseTextSize();
+    bool  CanDecreaseTextSize() const;
     void  DecreaseTextSize();
 
-    float GetWebkitZoom();
+    float GetWebkitZoom() const;
     void  SetWebkitZoom(float zoom);
 
     // don't hide base class virtuals
@@ -161,6 +158,6 @@ private:
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 
-#endif // wxUSE_WEBKIT
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT 
 
 #endif // _WX_WEBKIT_H_