X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f2a8de6e754cbbd6d0d7c216c5b44518fae872e..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/generic/datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index f951b948ea..56a79df9d2 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -28,15 +28,18 @@
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcmemory.h"
+    #include "wx/intl.h"
     #include "wx/panel.h"
     #include "wx/textctrl.h"
     #include "wx/valtext.h"
 #endif
 
+#include "wx/calctrl.h"
+#include "wx/combo.h"
+
 #include "wx/datectrl.h"
 #include "wx/generic/datectrl.h"
 
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -110,7 +113,7 @@ public:
         else // invalid date
         {
             wxASSERT_MSG( HasDPFlag(wxDP_ALLOWNONE),
-                            _T("this control must have a valid date") );
+                            wxT("this control must have a valid date") );
 
             m_combo->SetText(wxEmptyString);
         }
@@ -127,7 +130,7 @@ public:
 
         if ( !s.empty() )
         {
-            pDt->ParseFormat(s.c_str(), m_format);
+            pDt->ParseFormat(s, m_format);
             if ( !pDt->IsValid() )
                 return false;
         }
@@ -202,66 +205,19 @@ private:
         return m_combo->GetParent()->HasFlag(flag);
     }
 
-    // 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
+    // Return the format to be used for the dates shown by the control. This
+    // functions honours wxDP_SHOWCENTURY flag.
     wxString GetLocaleDateFormat() const
     {
-        wxString x_format(wxT("%x"));
-        wxString fmt;
-        int year_cnt = 0, month_cnt = 0, day_cnt = 0;
-
-        wxDateTime dt;
-        dt.ParseFormat(wxT("2003-10-17"), wxT("%Y-%m-%d"));
-        wxString str(dt.Format(x_format));
-
-        const wxChar *p = str.c_str();
-        while ( *p )
-        {
-            if (wxIsdigit(*p))
-            {
-                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
-                    // this shouldn't happen
-                    return x_format;
-            }
-            else {
-                fmt.Append(*p);
-                p++;
-            }
-        }
-
-        if (year_cnt == 1 && month_cnt == 1 && day_cnt == 1)
-            return fmt;
-
-        return x_format;
+#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)
@@ -271,7 +227,7 @@ private:
         if ( m_combo )
         {
             wxArrayString allowedChars;
-            for ( wxChar c = _T('0'); c <= _T('9'); c++ )
+            for ( wxChar c = wxT('0'); c <= wxT('9'); c++ )
                 allowedChars.Add(wxString(c, 1));
 
             const wxChar *p2 = m_format.c_str();
@@ -364,7 +320,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),
-                  _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") );
+                  wxT("wxDP_SPIN style not supported, use wxDP_DEFAULT") );
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxBORDER_NONE,
@@ -423,7 +379,27 @@ bool wxDatePickerCtrlGeneric::Destroy()
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
 {
-    return m_combo->GetBestSize();
+    // A better solution would be to use a custom text control that would have
+    // the best size determined by the current date format and let m_combo take
+    // care of the best size computation, but this isn't easily possible with
+    // wxComboCtrl currently, so we compute our own best size here instead even
+    // if this means adding some extra margins to account for text control
+    // borders, space between it and the button and so on.
+    wxSize size = m_combo->GetButtonSize();
+
+    wxTextCtrl* const text = m_combo->GetTextCtrl();
+    size.x += text->GetTextExtent(text->GetValue()).x;
+    size.x += 2*text->GetCharWidth(); // This is the margin mentioned above.
+
+    return size;
+}
+
+wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const
+{
+    wxWindowList parts;
+    parts.push_back(m_combo);
+    parts.push_back(m_popup);
+    return parts;
 }
 
 // ----------------------------------------------------------------------------