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

fixed calendar control height calculation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-05-25 13:35:22 +00:00
parent 89a0a3220b
commit 226ee02213
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/calctrl.cpp
View File

@ -472,10 +472,9 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
wxCoord width = 7*m_widthCol, wxCoord width = 7*m_widthCol,
height = 7*m_heightRow; height = 7*m_heightRow;
wxSize sizeCombo = m_comboMonth->GetBestSize(), // the combobox doesn't report its height correctly (it returns the
sizeSpin = m_spinYear->GetBestSize(); // height including the drop down list) so don't use it
height += VERT_MARGIN + m_spinYear->GetBestSize().y;
height += VERT_MARGIN + wxMax(sizeCombo.y, sizeSpin.y);
if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) ) if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) )
{ {