Fix missing documentation for several GDI functions.

[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 7ece4240316d3c9a4dc805e6ac901d7832d7c795..8733618c08a35c0076325133fc1b176a487558fc 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -15,20 +15,19 @@
 
 #include "wx/setup.h"
 
 
 #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"
 
 
 #include "wx/control.h"
 #include "wx/webview.h"
 

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

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

-class wxMacControl;
-class wxWidgetCocoaImpl;
-
-class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView

 {
 public:
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 {
 public:
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);


@@ -55,15 +54,11 @@ public:
     virtual bool CanGoForward() const;
     virtual void GoBack();
     virtual void GoForward();
     virtual bool CanGoForward() const;
     virtual void GoBack();
     virtual void GoForward();

-    virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
+    virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);

     virtual void Stop();
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;
 
     virtual void Stop();
     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 void LoadURL(const wxString& url);
     virtual void Print();
 
     virtual void LoadURL(const wxString& url);


@@ -77,32 +72,40 @@ public:
     virtual bool CanSetZoomType(wxWebViewZoomType type) const;
 
     virtual bool IsBusy() const { return m_busy; }
     virtual bool CanSetZoomType(wxWebViewZoomType type) const;
 
     virtual bool IsBusy() const { return m_busy; }

-    
+

     //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);
     //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);

-    
+

     //Undo / redo functionality
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
     virtual void Undo();
     virtual void Redo();
 
     //Undo / redo functionality
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
     virtual void Undo();
     virtual void Redo();
 

+    //Find function
+    virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) 
+    { 
+        wxUnusedVar(text);
+        wxUnusedVar(flags);
+        return wxNOT_FOUND; 
+    }
+

     //Clipboard functions
     //Clipboard functions

-    virtual bool CanCut() const { return false; }
-    virtual bool CanCopy() const { return false; }
-    virtual bool CanPaste() const { 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();
     virtual void Cut();
     virtual void Copy();
     virtual void Paste();

-    
+

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

-    
+

     //Selection
     virtual void DeleteSelection();
     virtual bool HasSelection() const;
     //Selection
     virtual void DeleteSelection();
     virtual bool HasSelection() const;


@@ -110,12 +113,14 @@ public:
     virtual wxString GetSelectedText() const;
     virtual wxString GetSelectedSource() const;
     virtual void ClearSelection();
     virtual wxString GetSelectedText() const;
     virtual wxString GetSelectedSource() const;
     virtual void ClearSelection();

-    
+

     void RunScript(const wxString& javascript);
     void RunScript(const wxString& javascript);

-    
+

     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
 
     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
 

+    virtual void* GetNativeBackend() const { return m_webView; }
+

     // ---- methods not from the parent (common) interface
     bool  CanGetPageSource() const;
 
     // ---- methods not from the parent (common) interface
     bool  CanGetPageSource() const;
 


@@ -144,6 +149,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();
 


@@ -152,7 +159,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.


@@ -161,6 +168,20 @@ private:
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 

-#endif // wxUSE_WEBKIT
+class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory
+{
+public:
+    virtual wxWebView* Create() { return new wxWebViewWebKit; }
+    virtual wxWebView* Create(wxWindow* parent,
+                              wxWindowID id,
+                              const wxString& url = wxWebViewDefaultURLStr,
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& size = wxDefaultSize,
+                              long style = 0,
+                              const wxString& name = wxWebViewNameStr)
+    { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); }
+};
+
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT

 
 #endif // _WX_WEBKIT_H_
 
 #endif // _WX_WEBKIT_H_