removing NSWindow based mouse tracking in favour of 10.5+ trackingArea implementation

[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 491d0d723c357166758c937bdb86927d84348a4f..7fea5243a78d533bd5e6002e60a679f329be3c3c 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -15,8 +15,8 @@
 
 #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"


@@ -25,10 +25,7 @@
 // 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);


@@ -66,7 +63,7 @@ public:
 
     virtual void Print();
 
 
     virtual void Print();
 

-    virtual void LoadUrl(const wxString& url);
+    virtual void LoadURL(const wxString& url);

     virtual wxString GetCurrentURL() const;
     virtual wxString GetCurrentTitle() const;
     virtual wxWebViewZoom GetZoom() const;
     virtual wxString GetCurrentURL() const;
     virtual wxString GetCurrentTitle() const;
     virtual wxWebViewZoom GetZoom() const;


@@ -92,9 +89,9 @@ public:
     virtual void Redo();
 
     //Clipboard functions
     virtual void Redo();
 
     //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();


@@ -161,6 +158,6 @@ 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
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT 

 
 #endif // _WX_WEBKIT_H_
 
 #endif // _WX_WEBKIT_H_