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

Yet more fixes for wxNotebook compatibility...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2004-06-02 00:48:55 +00:00
parent e69d17754d
commit be98622c86
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,19 +257,26 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
void wxWebKitCtrl::OnSize(wxSizeEvent &event){ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
wxWindow* parent = GetParent(); wxWindow* parent = GetParent();
bool inNotebook = false; bool inNotebook = false;
int x, y; int x = 0;
int y = 18;
while(parent != NULL) while(parent != NULL)
{ {
x += parent->GetPosition().x;
y += parent->GetPosition().y;
if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ){ if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ){
NSRect bounds = [m_webView frame]; inNotebook = true;
bounds.origin.x += parent->GetPosition().x;
bounds.origin.y += 18;
[m_webView setFrame:bounds];
break; break;
} }
parent = parent->GetParent(); parent = parent->GetParent();
} }
if (inNotebook){
NSRect bounds = [m_webView frame];
bounds.origin.x += x;
bounds.origin.y += y;
[m_webView setFrame:bounds];
}
[m_webView display]; [m_webView display];
event.Skip(); event.Skip();
} }