X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72213209b7128b1d77ff9abc8d96e9f0158b51ae..a91fbc8e34b7b4bf203b03ac66f129e85cdfa53b:/src/html/htmlctrl/webkit/webkit.mm?ds=sidebyside

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index 22d4b23684..cb85a483a4 100755
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -13,8 +13,6 @@
     #pragma implementation "webkit.h"
 #endif
 
-#if wxUSE_WEBKIT
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,6 +20,8 @@
     #include "wx/wx.h"
 #endif
 
+#if wxUSE_WEBKIT
+
 #ifdef __WXCOCOA__
 #include "wx/cocoa/autorelease.h"
 #else
@@ -145,13 +145,14 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
     SetInitialFrameRect(pos,sizeInstance);
 #else
     m_macIsUserPane = false;
+    m_peer = new wxMacControl();
     wxControl::Create(parent, m_windowID, pos, size, style , validator , name);
     WebInitForCarbon();
-    HIWebViewCreate( (HIViewRef*) *m_peer );
+    HIWebViewCreate( m_peer->GetControlRefAddr() );
     
-    m_webView = (WebView*) HIWebViewGetWebView( (HIViewRef) *m_peer );
+    m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
     MacPostControlCreate(pos, size);
-    HIViewSetVisible( (HIViewRef) *m_peer, true );           
+    HIViewSetVisible( m_peer->GetControlRef(), true );           
     [m_webView setHidden:false];
 #endif
 
@@ -199,17 +200,17 @@ bool wxWebKitCtrl::CanGoForward(){
 bool wxWebKitCtrl::GoBack(){
     if ( !m_webView )
         return false;
-        
-    [m_webView goBack];
-    return true;
+    
+    bool result = [(WebView*)m_webView goBack];
+    return result;
 }
 
 bool wxWebKitCtrl::GoForward(){ 
     if ( !m_webView )
         return false;
         
-    [m_webView goForward];
-    return true;
+    bool result = [(WebView*)m_webView goForward];
+    return result;
 }
 
 void wxWebKitCtrl::Reload(){ 
@@ -235,14 +236,13 @@ bool wxWebKitCtrl::CanGetPageSource(){
 }
 
 wxString wxWebKitCtrl::GetPageSource(){
-    if ( !m_webView )
-        return wxT("");
     
     if (CanGetPageSource()){
         WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
         return wxStringWithNSString( [[dataSource representation] documentSource] );
     }
     
+    return wxT("");
 }
 
 void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
@@ -262,7 +262,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     wxWindow* parent = GetParent();
     bool inNotebook = false;
     int x = 0;
-    int y = 18; 
+    int y = 18;
     while(parent != NULL)
     {
         // keep adding the position until we hit the notebook
@@ -293,7 +293,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
 }
 
 void wxWebKitCtrl::MacVisibilityChanged(){
-    bool isHidden = !IsControlVisible( (HIViewRef)*m_peer);
+    bool isHidden = !IsControlVisible( m_peer->GetControlRef());
     [m_webView setHidden:isHidden];
 }
 
@@ -373,4 +373,4 @@ void wxWebKitCtrl::MacVisibilityChanged(){
 }
 @end
 
-#endif //wxUSE_WEBKIT
\ No newline at end of file
+#endif //wxUSE_WEBKIT