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

don't pass negative height to wxWindow::SetSize(), this results in GTK+ warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-20 14:41:24 +00:00
parent 2038c5e2cb
commit f96f6a880c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/aui/auibook.cpp
View File

@@ -2712,16 +2712,23 @@ public:
for (i = 0; i < page_count; ++i) for (i = 0; i < page_count; ++i)
{ {
int height = m_rect.height - m_tab_ctrl_height;
if ( height < 0 )
{
// avoid passing negative height to wxWindow::SetSize(), this
// results in assert failures/GTK+ warnings
height = 0;
}
wxAuiNotebookPage& page = pages.Item(i); wxAuiNotebookPage& page = pages.Item(i);
if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM) if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM)
{ {
page.window->SetSize(m_rect.x, m_rect.y, page.window->SetSize(m_rect.x, m_rect.y, m_rect.width, height);
m_rect.width, m_rect.height - m_tab_ctrl_height);
} }
else //TODO: if (GetFlags() & wxAUI_NB_TOP) else //TODO: if (GetFlags() & wxAUI_NB_TOP)
{ {
page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height, page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height,
m_rect.width, m_rect.height - m_tab_ctrl_height); m_rect.width, height);
} }
// TODO: else if (GetFlags() & wxAUI_NB_LEFT){} // TODO: else if (GetFlags() & wxAUI_NB_LEFT){}
// TODO: else if (GetFlags() & wxAUI_NB_RIGHT){} // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){}