Oops, file wasn't saved before last commit

[wxWidgets.git] / src / generic / datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 72a80758746972c703cdec61607ab5dfbfa9c6b6..ab5d7448d7331e3d894eaf1dc6dfe9074460f01a 100644 (file)
--- 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:
 // Purpose:     generic wxDatePickerCtrlGeneric implementation
 // Author:      Andreas Pflug
 // Modified by:


@@ -569,7 +569,7 @@ void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h)
     wxControl::DoMoveWindow(x, y, w, h);
 
     if (m_dropped)
     wxControl::DoMoveWindow(x, y, w, h);
 
     if (m_dropped)

-        DropDown(true);
+        DropDown(false);

 }
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
 }
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const


@@ -580,13 +580,7 @@ wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
         int eh=m_txt->GetBestSize().y;
         return wxSize(DEFAULT_ITEM_WIDTH, bh > eh ? bh : eh);
     }
         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
 #endif // wxUSE_DATEPICKCTRL_GENERIC
 
 #endif // wxUSE_DATEPICKCTRL

-