X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9ccc09c64f4c29d4667796bef7b507d9e8d25ed..211da8a57d923da0fda6402dc6d5417124497171:/include/wx/osx/webview_webkit.h

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 975bee5ec7..cf873771a7 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -15,7 +15,8 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__))
+#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                         ||  defined(__WXOSX_CARBON__))
 
 #include "wx/control.h"
 #include "wx/webview.h"
@@ -24,6 +25,9 @@
 // Web Kit Control
 // ----------------------------------------------------------------------------
 
+class wxMacControl;
+class wxWidgetCocoaImpl;
+
 class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView
 {
 public:
@@ -60,6 +64,8 @@ public:
     virtual void SetPageTitle(const wxString& title) { m_pageTitle = title; }
     virtual wxString GetPageTitle(){ return m_pageTitle; }
 
+    //We do not want to hide the other overloads
+    using wxWebView::SetPage;
     virtual void SetPage(const wxString& html, const wxString& baseUrl);
 
     virtual void Print();
@@ -78,12 +84,12 @@ public:
     
     //History functions
     virtual void ClearHistory() {}
-    virtual void EnableHistory(bool enable = true) {}
+    virtual void EnableHistory(bool enable = true);
     virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory()
-            { return wxVector<wxSharedPtr<wxWebHistoryItem> >() }
+            { return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }
     virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory() 
-            { return wxVector<wxSharedPtr<wxWebHistoryItem> >() }
-    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item) {}
+            { return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> WXUNUSED(item)) {}
     
     //Undo / redo functionality
     virtual bool CanUndo() { return false; }
@@ -105,13 +111,16 @@ public:
     
     //Selection
     virtual void DeleteSelection();
-    virtual bool HasSelection() { return false };
+    virtual bool HasSelection();
     virtual void SelectAll() {};
     virtual wxString GetSelectedText();
     virtual wxString GetSelectedSource() { return ""; }
     virtual void ClearSelection() {}
     
     void RunScript(const wxString& javascript);
+    
+    //Virtual Filesystem Support
+    virtual void RegisterHandler(wxWebHandler* WXUNUSED(handler)) {};
 
     // ---- methods not from the parent (common) interface
     bool  CanGetPageSource();
@@ -158,6 +167,12 @@ private:
     void* m_webKitCtrlEventHandler;
     //It should be WebView*, but WebView is an Objective-C class
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
+    
+#if wxOSX_USE_CARBON
+    wxMacControl *m_peer;
+#else
+    wxWidgetCocoaImpl *m_peer;
+#endif
 };
 
 #endif // wxUSE_WEBKIT