Fix compilation for OSX backend.

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

diff --git a/include/wx/osx/webhistoryitem_webkit.h b/include/wx/osx/webhistoryitem_webkit.h
index aaec1848c7b59a3d781c941d334925ee715bac0f..44e7be50c59a896f221d9b56e7db5a60fae80692 100644 (file)
--- a/include/wx/osx/webhistoryitem_webkit.h
+++ b/include/wx/osx/webhistoryitem_webkit.h
@@ -12,7 +12,8 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
+#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                         ||  defined(__WXOSX_CARBON__))

 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {
 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index e83b1ccdb500e9ab72fc46dfab9785382467e84f..59d8ae1dbd7e2b4d54d1caf148dd2580b3a37599 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -15,7 +15,8 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
+#if 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"

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 0be86709bc7e9e77e8ef69643e28b9a8f7e197af..9323cc563aa9ef9730a3351e3886f6c3bf53c375 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -14,6 +14,9 @@
 
 #include "wx/osx/webview_webkit.h"
 
 
 #include "wx/osx/webview_webkit.h"
 

+#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                         ||  defined(__WXOSX_CARBON__))
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,8 +24,6 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-//#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
-

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


@@ -45,7 +46,7 @@ std::map<WebView*, wxWebViewWebKit*> wx_webviewctrls;
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);

 
 BEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl)
 #if defined(__WXMAC__) && wxOSX_USE_CARBON
 
 BEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl)
 #if defined(__WXMAC__) && wxOSX_USE_CARBON


@@ -1194,10 +1195,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
     
     wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
     NSString *url = [[request URL] absoluteString];
     
     wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
     NSString *url = [[request URL] absoluteString];

-    wxString target = wxStringWithNSString([frame name]);

     wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
                                    wx_webviewctrls[sender]->GetId(),
     wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
                                    wx_webviewctrls[sender]->GetId(),

-                                   wxStringWithNSString( url ), target, true);
+                                   wxStringWithNSString( url ), "", true);

 
     if (webKitWindow && webKitWindow->GetEventHandler())
         webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
 
     if (webKitWindow && webKitWindow->GetEventHandler())
         webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);


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

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