diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 3c90fb1cc5..72a8075874 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -580,7 +580,13 @@ wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
         int eh=m_txt->GetBestSize().y;
         return wxSize(DEFAULT_ITEM_WIDTH, bh > eh ? bh : eh);
     }
-    return wxSize(DEFAULT_ITEM_WIDTH,DEFAULT_ITEM_HEIGHT);
+    return wxSize(DEFAULT_ITEM_WIDTH,
+#if defined(__WXMSW__) || defined(__WXPM__)
+        DEFAULT_ITEM_HEIGHT
+#else
+        8 // FIXME ASAP
+#endif
+    );
 }