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

Fix wxMac preprocessor check in wxWebView code.

Browse Source 
Fix typo in "__WXMAC__" in wxWebView under wxOSX/Carbon and also in
wxWebKitCtrl from where this code was copied.

Closes #14352.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-06-01 11:01:02 +00:00
parent f00acdb8f4
commit 06d14de207
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -702,7 +702,7 @@ wxString wxWebKitCtrl::RunScript(const wxString& javascript){
} }
void wxWebKitCtrl::OnSize(wxSizeEvent &event){ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
#if defined(__WXMAC_) && wxOSX_USE_CARBON #if defined(__WXMAC__) && wxOSX_USE_CARBON
// 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.
// I put it in OnSize because these calcs are not perfect, and in fact are basically // I put it in OnSize because these calcs are not perfect, and in fact are basically

2
src/osx/webview_webkit.mm
View File

@@ -648,7 +648,7 @@ void wxWebViewWebKit::RunScript(const wxString& javascript)
void wxWebViewWebKit::OnSize(wxSizeEvent &event) void wxWebViewWebKit::OnSize(wxSizeEvent &event)
{ {
#if defined(__WXMAC_) && wxOSX_USE_CARBON #if defined(__WXMAC__) && wxOSX_USE_CARBON
// This is a nasty hack because WebKit seems to lose its position when it is // 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. // embedded in a control that is not itself the content view for a TLW.
// I put it in OnSize because these calcs are not perfect, and in fact are // I put it in OnSize because these calcs are not perfect, and in fact are