Change wxNotebook selection before sending page changed event in wxMSW.

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 5d4e6b0614655810b28814677b5c496ccd4937c3..f45dba82ab5e824d7f60823826e163f12657402a 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -34,10 +34,12 @@
     #include "wx/valtext.h"
 #endif
 
+#include "wx/calctrl.h"
+#include "wx/combo.h"
+
 #include "wx/datectrl.h"
 #include "wx/generic/datectrl.h"
 
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -207,11 +209,15 @@ private:
     // functions honours wxDP_SHOWCENTURY flag.
     wxString GetLocaleDateFormat() const
     {
+#if wxUSE_INTL
         wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT);
         if ( HasDPFlag(wxDP_SHOWCENTURY) )
             fmt.Replace("%y", "%Y");
 
         return fmt;
+#else // !wxUSE_INTL
+        return wxT("x");
+#endif // wxUSE_INTL/!wxUSE_INTL
     }
 
     bool SetFormat(const wxString& fmt)
@@ -376,6 +382,16 @@ wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
     return m_combo->GetBestSize();
 }
 
+wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const
+{
+    wxWindowList parts;
+    if (m_combo)
+        parts.push_back(m_combo);
+    if (m_popup)
+        parts.push_back(m_popup);
+    return parts;
+}
+
 // ----------------------------------------------------------------------------
 // wxDatePickerCtrlGeneric API
 // ----------------------------------------------------------------------------