Fixes to remove compile warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -79,7 +79,7 @@ private:
|
||||
wxWindowID m_windowID;
|
||||
wxString m_currentURL;
|
||||
wxString m_pageTitle;
|
||||
void* m_webView;
|
||||
objc_object* m_webView;
|
||||
//It should be WebView, but WebView is Cocoa only, so any class which included
|
||||
//this header would have to link to Cocoa, so for now use void* instead.
|
||||
};
|
||||
|
@@ -201,16 +201,16 @@ 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(){
|
||||
@@ -236,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){
|
||||
|
Reference in New Issue
Block a user