Fix compilation errors under OSX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 975bee5ec7f80fbc3b149b2ff9340191002a4afd..311aff84d80d778f033cfdca32d3b9c2a3329801 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -15,7 +15,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__))
+//#if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__))

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


@@ -80,9 +80,9 @@ public:
     virtual void ClearHistory() {}
     virtual void EnableHistory(bool enable = true) {}
     virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory()
     virtual void ClearHistory() {}
     virtual void EnableHistory(bool enable = true) {}
     virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory()

-            { return wxVector<wxSharedPtr<wxWebHistoryItem> >() }
+            { return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }

     virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory() 
     virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory() 

-            { return wxVector<wxSharedPtr<wxWebHistoryItem> >() }
+            { return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }

     virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item) {}
     
     //Undo / redo functionality
     virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item) {}
     
     //Undo / redo functionality


@@ -105,7 +105,7 @@ public:
     
     //Selection
     virtual void DeleteSelection();
     
     //Selection
     virtual void DeleteSelection();

-    virtual bool HasSelection() { return false };
+    virtual bool HasSelection() { return false; };

     virtual void SelectAll() {};
     virtual wxString GetSelectedText();
     virtual wxString GetSelectedSource() { return ""; }
     virtual void SelectAll() {};
     virtual wxString GetSelectedText();
     virtual wxString GetSelectedSource() { return ""; }


@@ -158,8 +158,14 @@ 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.
     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
+//#endif // wxUSE_WEBKIT

 
 #endif // _WX_WEBKIT_H_
 
 #endif // _WX_WEBKIT_H_

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index ec4960255295c591a2dbe88d1d71d4974b915001..daae499d702f54e0d9daf4bbd550e1ccd01660e5 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -21,7 +21,7 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+//#if wxHAVE_WEB_BACKEND_OSX_WEBKIT

 
 #ifdef __WXCOCOA__
 #include "wx/cocoa/autorelease.h"
 
 #ifdef __WXCOCOA__
 #include "wx/cocoa/autorelease.h"


@@ -323,25 +323,6 @@ inline NSString* wxNSStringWithWxString(const wxString &wxstring)
 #endif // wxUSE_UNICODE
 }
 
 #endif // wxUSE_UNICODE
 }
 

-inline int wxNavTypeFromWebNavType(int type){
-    if (type == WebNavigationTypeLinkClicked)
-        return wxWEBKIT_NAV_LINK_CLICKED;
-
-    if (type == WebNavigationTypeFormSubmitted)
-        return wxWEBKIT_NAV_FORM_SUBMITTED;
-
-    if (type == WebNavigationTypeBackForward)
-        return wxWEBKIT_NAV_BACK_NEXT;
-
-    if (type == WebNavigationTypeReload)
-        return wxWEBKIT_NAV_RELOAD;
-
-    if (type == WebNavigationTypeFormResubmitted)
-        return wxWEBKIT_NAV_FORM_RESUBMITTED;
-
-    return wxWEBKIT_NAV_OTHER;
-}
-

 @interface MyFrameLoadMonitor : NSObject
 {
     wxWebViewWebKit* webKitWindow;
 @interface MyFrameLoadMonitor : NSObject
 {
     wxWebViewWebKit* webKitWindow;


@@ -411,7 +392,6 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     if(m_parent) m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,sizeInstance);
 #else
     if(m_parent) m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,sizeInstance);
 #else

-    m_macIsUserPane = false;

     wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
 
 #if wxOSX_USE_CARBON
     wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
 
 #if wxOSX_USE_CARBON


@@ -735,7 +715,7 @@ wxString wxWebViewWebKit::GetSelectedText()
 void wxWebViewWebKit::RunScript(const wxString& javascript)
 {
     if ( !m_webView )
 void wxWebViewWebKit::RunScript(const wxString& javascript)
 {
     if ( !m_webView )

-        return wxEmptyString;
+        return;

 
     [[m_webView windowScriptObject] evaluateWebScript:
                     (NSString*)wxNSStringWithWxString( javascript )];
 
     [[m_webView windowScriptObject] evaluateWebScript:
                     (NSString*)wxNSStringWithWxString( javascript )];


@@ -932,7 +912,7 @@ void wxWebViewWebKit::Cut()
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    [(WebView*)m_webView cut];
+    [(WebView*)m_webView cut:m_webView];

 }
 
 void wxWebViewWebKit::Copy()
 }
 
 void wxWebViewWebKit::Copy()


@@ -940,7 +920,7 @@ void wxWebViewWebKit::Copy()
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    [(WebView*)m_webView copy];
+    [(WebView*)m_webView copy:m_webView];

 }
 
 void wxWebViewWebKit::Paste()
 }
 
 void wxWebViewWebKit::Paste()


@@ -948,7 +928,7 @@ void wxWebViewWebKit::Paste()
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    [(WebView*)m_webView paste];
+    [(WebView*)m_webView paste:m_webView];

 }
 
 void wxWebViewWebKit::DeleteSelection()
 }
 
 void wxWebViewWebKit::DeleteSelection()


@@ -1216,4 +1196,4 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 }
 @end
 
 }
 @end
 

-#endif //wxHAVE_WEB_BACKEND_OSX_WEBKIT
+//#endif //wxHAVE_WEB_BACKEND_OSX_WEBKIT