Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed incorrect get page source check around SetPageSource.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-06-27 20:53:37 +00:00
parent 3c3b35589a
commit 2d837688be
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -249,12 +249,9 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
if ( !m_webView ) if ( !m_webView )
return; return;
if (CanGetPageSource()){
[[m_webView mainFrame] loadHTMLString:(NSString*)wxNSStringWithWxString( source ) baseURL:[NSURL URLWithString:wxNSStringWithWxString( baseUrl )]]; [[m_webView mainFrame] loadHTMLString:(NSString*)wxNSStringWithWxString( source ) baseURL:[NSURL URLWithString:wxNSStringWithWxString( baseUrl )]];
} }
}
void wxWebKitCtrl::OnSize(wxSizeEvent &event){ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
// This is a nasty hack because WebKit seems to lose its position when it is embedded // This is a nasty hack because WebKit seems to lose its position when it is embedded
// in a control that is not itself the content view for a TLW. // in a control that is not itself the content view for a TLW.