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

wxCalendarCtrl workaround for occasional wrong combobox height reporting on wxMSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-06-14 11:42:01 +00:00
parent fc4c80b8c0
commit 028285e4af
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/generic/calctrl.cpp
View File

@@ -793,16 +793,27 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
wxSize sizeCombo = m_comboMonth->GetSize(); wxSize sizeCombo = m_comboMonth->GetSize();
wxSize sizeStatic = m_staticMonth->GetSize(); wxSize sizeStatic = m_staticMonth->GetSize();
wxSize sizeSpin = m_spinYear->GetSize(); wxSize sizeSpin = m_spinYear->GetSize();
int dy = (sizeCombo.y - sizeStatic.y) / 2;
// wxMSW sometimes reports the wrong combo height,
// so on this platform we'll use the spin control
// height instead.
#ifdef __WXMSW__
int maxHeight = sizeSpin.y;
int requiredSpinHeight = -1;
#else
int maxHeight = sizeCombo.y;
int requiredSpinHeight = sizeCombo.y;
#endif
int dy = (maxHeight - sizeStatic.y) / 2;
m_comboMonth->Move(x, y); m_comboMonth->Move(x, y);
m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y); m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1, sizeStatic.y);
int xDiff = sizeCombo.x + HORZ_MARGIN; int xDiff = sizeCombo.x + HORZ_MARGIN;
m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y); m_spinYear->SetSize(x + xDiff, y, width - xDiff, requiredSpinHeight);
m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y); m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN; yDiff = wxMax(sizeSpin.y, maxHeight) + VERT_MARGIN;
} }
else // no controls on the top else // no controls on the top
{ {