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

fixing osx_carbon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-08-11 08:42:39 +00:00
parent 59cb255555
commit 2e14066008
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osx/webview_webkit.mm
View File

@@ -330,20 +330,21 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name); wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
#if wxOSX_USE_CARBON #if wxOSX_USE_CARBON
m_peer = new wxMacControl(this); wxMacControl* peer = new wxMacControl(this);
WebInitForCarbon(); WebInitForCarbon();
HIWebViewCreate( m_peer->GetControlRefAddr() ); HIWebViewCreate( peer->GetControlRefAddr() );
m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() ); m_webView = (WebView*) HIWebViewGetWebView( peer->GetControlRef() );
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
if ( UMAGetSystemVersion() >= 0x1030 ) if ( UMAGetSystemVersion() >= 0x1030 )
HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ; HIViewChangeFeatures( peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
#endif #endif
InstallControlEventHandler(m_peer->GetControlRef(), InstallControlEventHandler(peer->GetControlRef(),
GetwxWebViewWebKitEventHandlerUPP(), GetwxWebViewWebKitEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this, GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_webKitCtrlEventHandler); (EventHandlerRef *)&m_webKitCtrlEventHandler);
SetPeer(peer);
#else #else
NSRect r = wxOSXGetFrameForControl( this, pos , size ) ; NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
m_webView = [[WebView alloc] initWithFrame:r m_webView = [[WebView alloc] initWithFrame:r
@@ -355,7 +356,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
MacPostControlCreate(pos, size); MacPostControlCreate(pos, size);
#if wxOSX_USE_CARBON #if wxOSX_USE_CARBON
HIViewSetVisible( m_peer->GetControlRef(), true ); HIViewSetVisible( GetPeer()->GetControlRef(), true );
#endif #endif
[m_webView setHidden:false]; [m_webView setHidden:false];
@@ -711,7 +712,7 @@ void wxWebViewWebKit::OnSize(wxSizeEvent &event)
void wxWebViewWebKit::MacVisibilityChanged(){ void wxWebViewWebKit::MacVisibilityChanged(){
#if defined(__WXMAC__) && wxOSX_USE_CARBON #if defined(__WXMAC__) && wxOSX_USE_CARBON
bool isHidden = !IsControlVisible( m_peer->GetControlRef()); bool isHidden = !IsControlVisible( GetPeer()->GetControlRef());
if (!isHidden) if (!isHidden)
[(WebView*)m_webView display]; [(WebView*)m_webView display];