From 226ee022131332b2d1aaf63e5bcc80a670f6c6ee Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 25 May 2001 13:35:22 +0000
Subject: [PATCH] fixed calendar control height calculation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/calctrl.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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