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

Need an extra pixel or best size is incorrect when we have a divider (apparent with e.g. wxAUI)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-03-27 13:41:12 +00:00
parent 579c608e3e
commit b4c61ec475
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/tbar95.cpp
View File

@@ -362,6 +362,9 @@ wxSize wxToolBar::DoGetBestSize() const
sizeBest.y = size.cy; sizeBest.y = size.cy;
} }
if (!IsVertical() && !(GetWindowStyle() & wxTB_NODIVIDER))
sizeBest.y += 1;
CacheBestSize(sizeBest); CacheBestSize(sizeBest);
return sizeBest; return sizeBest;
@@ -1073,7 +1076,7 @@ bool wxToolBar::Realize()
{ {
// if not set yet, have one column // if not set yet, have one column
m_maxRows = 1; m_maxRows = 1;
SetRows(m_nButtons); SetRows(m_nButtons);
} }
InvalidateBestSize(); InvalidateBestSize();
@@ -1340,7 +1343,7 @@ void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
tool->SetNormalBitmap(bitmap); tool->SetNormalBitmap(bitmap);
Realize(); Realize();
} }
} }
void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap ) void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
@@ -1352,7 +1355,7 @@ void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
tool->SetDisabledBitmap(bitmap); tool->SetDisabledBitmap(bitmap);
Realize(); Realize();
} }
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------