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

Ensure that setting wxChoice height to its default value does set it.

Browse Source 
Setting wxChoice height to its default value didn't change the height even if
the current height was different from the default. This resulted in problems
when a wxChoice was used inside a wxAuiToolBar because AUI temporarily reduces
the toolbar size to (1, 1) when docking it (thus ensuring that the height of
wxChoice is changed too) and generally didn't make sense.

Fix this by resetting the height to the default value if the value passed to
wxChoice::SetSize() is what it considers to be its default height.

Add a unit test for this bug and also add a wxChoice to AUI sample to allow
testing for wxChoice behaviour inside a wxAuiToolBar being [un]docked.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-03-18 15:07:39 +00:00
parent 3f931438cc
commit 0772a89875
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/choice.cpp
View File

@@ -553,8 +553,21 @@ void wxChoice::DoSetSize(int x, int y,
int width, int height,
int sizeFlags)
{
const int heightBest = GetBestSize().y;
// we need the real height below so get the current one if it's not given
if ( height != wxDefaultCoord && height != GetBestSize().y )
if ( height == wxDefaultCoord )
{
// height not specified, use the same as before
DoGetSize(NULL, &height);
}
else if ( height == heightBest )
{
// we don't need to manually manage our height, let the system use the
// default one
m_heightOwn = wxDefaultCoord;
}
else // non-default height specified
{
// set our new own height but be careful not to make it too big: the
// native control apparently stores it as a single byte and so setting
@@ -568,10 +581,6 @@ void wxChoice::DoSetSize(int x, int y,
else if ( m_heightOwn < COMBO_HEIGHT_ADJ )
m_heightOwn = COMBO_HEIGHT_ADJ;
}
else // height not specified
{
DoGetSize(NULL, &height);
}
// the height which we must pass to Windows should be the total height of