Hardware defines spec.

[wxWidgets.git] / src / html / htmlctrl / webkit / webkit.mm

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index 1b6155d1732655e5a8d2521c1d18f131ccb4f596..cb85a483a4871d60a690a2cb5e464061dfa1adfb 100755 (executable)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -200,17 +200,17 @@ bool wxWebKitCtrl::CanGoForward(){
 bool wxWebKitCtrl::GoBack(){
     if ( !m_webView )
         return false;
 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;
         
 }
 
 bool wxWebKitCtrl::GoForward(){ 
     if ( !m_webView )
         return false;
         

-    [m_webView goForward];
-    return true;
+    bool result = [(WebView*)m_webView goForward];
+    return result;

 }
 
 void wxWebKitCtrl::Reload(){ 
 }
 
 void wxWebKitCtrl::Reload(){ 


@@ -236,14 +236,13 @@ bool wxWebKitCtrl::CanGetPageSource(){
 }
 
 wxString wxWebKitCtrl::GetPageSource(){
 }
 
 wxString wxWebKitCtrl::GetPageSource(){

-    if ( !m_webView )
-        return wxT("");

     
     if (CanGetPageSource()){
         WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
         return wxStringWithNSString( [[dataSource representation] documentSource] );
     }
     
     
     if (CanGetPageSource()){
         WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
         return wxStringWithNSString( [[dataSource representation] documentSource] );
     }
     

+    return wxT("");

 }
 
 void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
 }
 
 void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){


@@ -263,7 +262,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     wxWindow* parent = GetParent();
     bool inNotebook = false;
     int x = 0;
     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
     while(parent != NULL)
     {
         // keep adding the position until we hit the notebook