X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0fb790beb01e56259c70b1ff22d9034d966b4cb..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/generic/datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 476c4c5e81..fc0e0ab720 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -72,11 +72,11 @@ public:
     {
         if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
                               wxPoint(0, 0), wxDefaultSize,
-                              wxCAL_SEQUENTIAL_MONTH_SELECTION 
+                              wxCAL_SEQUENTIAL_MONTH_SELECTION
                               | wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
             return false;
 
-        SetFormat("%x");
+        SetFormat(GetLocaleDateFormat());
 
         m_useSize  = wxCalendarCtrl::GetBestSize();
 
@@ -116,6 +116,11 @@ public:
         }
     }
 
+    bool IsTextEmpty() const
+    {
+        return m_combo->GetTextCtrl()->IsEmpty();
+    }
+
     bool ParseDateTime(const wxString& s, wxDateTime* pDt)
     {
         wxASSERT(pDt);
@@ -182,7 +187,7 @@ private:
 
         if ( !dt.IsValid() && HasDPFlag(wxDP_ALLOWNONE) )
             return;
-        
+
         // notify that we had to change the date after validation
         if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) ||
                 (!dt.IsValid() && dtOld.IsValid()) )
@@ -192,50 +197,77 @@ private:
         }
     }
 
-    bool HasDPFlag(int flag)
+    bool HasDPFlag(int flag) const
     {
         return m_combo->GetParent()->HasFlag(flag);
     }
 
-    bool SetFormat(const wxString& fmt)
+    // it expands "%x" format and changes %y to %Y if wxDP_SHOWCENTURY flag
+    // is given. If the locale format can't be easily analyzed (e.g. when
+    // the month is given as a name, not number), "%x" is returned
+    wxString GetLocaleDateFormat() const
     {
-        m_format.clear();
+        wxString x_format(wxT("%x"));
+        wxString fmt;
+        int year_cnt = 0, month_cnt = 0, day_cnt = 0;
 
         wxDateTime dt;
-        dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
-        wxString str(dt.Format(fmt));
+        dt.ParseFormat(wxT("2003-10-17"), wxT("%Y-%m-%d"));
+        wxString str(dt.Format(x_format));
 
         const wxChar *p = str.c_str();
         while ( *p )
         {
-            int n=wxAtoi(p);
-            if (n == dt.GetDay())
-            {
-                m_format.Append(wxT("%d"));
-                p += 2;
-            }
-            else if (n == (int)dt.GetMonth()+1)
-            {
-                m_format.Append(wxT("%m"));
-                p += 2;
-            }
-            else if (n == dt.GetYear())
+            if (wxIsdigit(*p))
             {
-                m_format.Append(wxT("%Y"));
-                p += 4;
-            }
-            else if (n == (dt.GetYear() % 100))
-            {
-                if ( HasDPFlag(wxDP_SHOWCENTURY) )
-                    m_format.Append(wxT("%Y"));
+                int n=wxAtoi(p);
+                if (n == dt.GetDay())
+                {
+                    fmt.Append(wxT("%d"));
+                    day_cnt++;
+                    p += 2;
+                }
+                else if (n == (int)dt.GetMonth()+1)
+                {
+                    fmt.Append(wxT("%m"));
+                    month_cnt++;
+                    p += 2;
+                }
+                else if (n == dt.GetYear())
+                {
+                    fmt.Append(wxT("%Y"));
+                    year_cnt++;
+                    p += 4;
+                }
+                else if (n == (dt.GetYear() % 100))
+                {
+                    if ( HasDPFlag(wxDP_SHOWCENTURY) )
+                        fmt.Append(wxT("%Y"));
+                    else
+                        fmt.Append(wxT("%y"));
+                    year_cnt++;
+                    p += 2;
+                }
                 else
-                    m_format.Append(wxT("%y"));
-                p += 2;
+                    // this shouldn't happen
+                    return x_format;
+            }
+            else {
+                fmt.Append(*p);
+                p++;
             }
-            else
-                m_format.Append(*p++);
         }
 
+        if (year_cnt == 1 && month_cnt == 1 && day_cnt == 1)
+            return fmt;
+        else
+            return x_format;
+    }
+
+    bool SetFormat(const wxString& fmt)
+    {
+        m_format = fmt;
+
         if ( m_combo )
         {
             wxArrayString allowedChars;
@@ -408,6 +440,8 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {
+    if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
+        return wxInvalidDateTime;
     return m_popup->GetDate();
 }