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

don't override the toolbar height with too small value

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-31 13:53:50 +00:00
parent dc8928439f
commit ddc170523c
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/propgrid/manager.cpp
View File

@@ -1061,24 +1061,7 @@ void wxPropertyGridManager::RecalculatePositions( int width, int height )
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
if ( m_pToolbar ) if ( m_pToolbar )
{ {
int tbHeight; m_pToolbar->SetSize(0, 0, width, -1);
#if ( wxMINOR_VERSION < 6 || (wxMINOR_VERSION == 6 && wxRELEASE_NUMBER < 2) )
tbHeight = -1;
#else
// In wxWidgets 2.6.2+, Toolbar default height may be broken
#if defined(__WXMSW__)
tbHeight = 24;
#elif defined(__WXGTK__)
tbHeight = -1; // 22;
#elif defined(__WXMAC__)
tbHeight = 22;
#else
tbHeight = 22;
#endif
#endif
m_pToolbar->SetSize(0,0,width,tbHeight);
propgridY += m_pToolbar->GetSize().y; propgridY += m_pToolbar->GetSize().y;
} }
#endif #endif