Better temporary fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3d3d7d0994
commit
68f2155bb7
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user