From e69d17754d53f0613dfe88b46acfcf6c2eaf5f2e Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Wed, 2 Jun 2004 00:26:57 +0000 Subject: [PATCH] wxWebKitCtrl now properly detects a wxNotebook anywhere in the hierarchy. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlctrl/webkit/webkit.mm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm index 93609c9294..adb86342ff 100755 --- a/src/html/htmlctrl/webkit/webkit.mm +++ b/src/html/htmlctrl/webkit/webkit.mm @@ -255,12 +255,21 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){ } void wxWebKitCtrl::OnSize(wxSizeEvent &event){ - if ( GetParent()->IsKindOf( CLASSINFO( wxNotebook) ) ){ - NSRect bounds = [m_webView frame]; - bounds.origin.x += GetParent()->GetPosition().x; - bounds.origin.y += 18; - [m_webView setFrame:bounds]; - } + wxWindow* parent = GetParent(); + bool inNotebook = false; + int x, y; + while(parent != NULL) + { + if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ){ + NSRect bounds = [m_webView frame]; + bounds.origin.x += parent->GetPosition().x; + bounds.origin.y += 18; + [m_webView setFrame:bounds]; + break; + } + parent = parent->GetParent(); + } + [m_webView display]; event.Skip(); } -- 2.47.2