]> git.saurik.com Git - wxWidgets.git/commitdiff
Better temporary fix.
authorWłodzimierz Skiba <abx@abx.art.pl>
Mon, 17 Jul 2006 06:28:39 +0000 (06:28 +0000)
committerWłodzimierz Skiba <abx@abx.art.pl>
Mon, 17 Jul 2006 06:28:39 +0000 (06:28 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/generic/datectlg.cpp

index 72a80758746972c703cdec61607ab5dfbfa9c6b6..1b2940997fb71f23d9db83f9a7454d6361ea1cd5 100644 (file)
@@ -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
-