From 68f2155bb74506ee9c26afbc762543133e0ad1a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 17 Jul 2006 06:28:39 +0000 Subject: [PATCH] Better temporary fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/datectlg.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 72a8075874..1b2940997f 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/datectlg.cpp +// Name: src/generic/datectlg.cpp // Purpose: generic wxDatePickerCtrlGeneric implementation // Author: Andreas Pflug // Modified by: @@ -580,13 +580,7 @@ wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const int eh=m_txt->GetBestSize().y; return wxSize(DEFAULT_ITEM_WIDTH, bh > eh ? bh : eh); } - return wxSize(DEFAULT_ITEM_WIDTH, -#if defined(__WXMSW__) || defined(__WXPM__) - DEFAULT_ITEM_HEIGHT -#else - 8 // FIXME ASAP -#endif - ); + return wxControl::DoGetBestSize(); } @@ -963,4 +957,3 @@ void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev) #endif // wxUSE_DATEPICKCTRL_GENERIC #endif // wxUSE_DATEPICKCTRL - -- 2.45.2