Don't export wxDataViewCtrlInternal unnecessarily.

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 3c5d6933b8df3a945d1e6a1e403603de3f98c900..0d67a6c6ecf21268659c9d9974ee7cea178d7b89 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -25,13 +25,6 @@
 
 #if wxUSE_DATEPICKCTRL
 
 
 #if wxUSE_DATEPICKCTRL
 

-#include "wx/datectrl.h"
-
-// use this version if we're explicitly requested to do it or if it's the only
-// one we have
-#if !defined(wxHAS_NATIVE_DATEPICKCTRL) || \
-        (defined(wxUSE_DATEPICKCTRL_GENERIC) && wxUSE_DATEPICKCTRL_GENERIC)
-

 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcmemory.h"


@@ -40,31 +33,14 @@
     #include "wx/valtext.h"
 #endif
 
     #include "wx/valtext.h"
 #endif
 

-#ifdef wxHAS_NATIVE_DATEPICKCTRL
-    // this header is not included from wx/datectrl.h if we have a native
-    // version, but we do need it here
-    #include "wx/generic/datectrl.h"
-#else
-    // we need to define _WX_DEFINE_DATE_EVENTS_ before including wx/dateevt.h to
-    // define the event types we use if we're the only date picker control version
-    // being compiled -- otherwise it's defined in the native version implementation
-    #define _WX_DEFINE_DATE_EVENTS_
-#endif
-
-#include "wx/dateevt.h"
+#include "wx/datectrl.h"
+#include "wx/generic/datectrl.h"

 
 

-#include "wx/calctrl.h"
-#include "wx/combo.h"

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
-    #define CALBORDER         0
-#else
-    #define CALBORDER         4
-#endif

 
 // ----------------------------------------------------------------------------
 // global variables
 
 // ----------------------------------------------------------------------------
 // global variables


@@ -96,42 +72,13 @@ public:
     {
         if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
                               wxPoint(0, 0), wxDefaultSize,
     {
         if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
                               wxPoint(0, 0), wxDefaultSize,

-                              wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
+                              wxCAL_SEQUENTIAL_MONTH_SELECTION
+                              | wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )

             return false;
 
             return false;
 

-        wxWindow *yearControl = wxCalendarCtrl::GetYearControl();
-
-        wxClientDC dc(yearControl);
-        dc.SetFont(yearControl->GetFont());
-        wxCoord width, dummy;
-        dc.GetTextExtent(wxT("2000"), &width, &dummy);
-        width += ConvertDialogToPixels(wxSize(20, 0)).x;
-
-        wxSize calSize = wxCalendarCtrl::GetBestSize();
-        wxSize yearSize = yearControl->GetSize();
-        yearSize.x = width;
-
-        wxPoint yearPosition = yearControl->GetPosition();
-
-        SetFormat(wxT("%x"));
+        SetFormat(GetLocaleDateFormat());

 
 

-        width = yearPosition.x + yearSize.x+2+CALBORDER/2;
-        if (width < calSize.x-4)
-            width = calSize.x-4;
-
-        int calPos = (width-calSize.x)/2;
-        if (calPos == -1)
-        {
-            calPos = 0;
-            width += 2;
-        }
-        wxCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);
-        yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
-                             yearSize.x, yearSize.y);
-        wxCalendarCtrl::GetMonthControl()->Move(0, 0);
-
-        m_useSize.x = width+CALBORDER/2;
-        m_useSize.y = calSize.y-2+CALBORDER;
+        m_useSize  = wxCalendarCtrl::GetBestSize();

 
         wxWindow* tx = m_combo->GetTextCtrl();
         if ( !tx )
 
         wxWindow* tx = m_combo->GetTextCtrl();
         if ( !tx )


@@ -158,21 +105,20 @@ public:
         if ( date.IsValid() )
         {
             m_combo->SetText(date.Format(m_format));
         if ( date.IsValid() )
         {
             m_combo->SetText(date.Format(m_format));

+            SetDate(date);

         }
         else // invalid date
         {
             wxASSERT_MSG( HasDPFlag(wxDP_ALLOWNONE),
         }
         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);
         }
 
             m_combo->SetText(wxEmptyString);
         }

-
-        m_currentDate = date;

     }
 
     }
 

-    const wxDateTime& GetDateValue() const
+    bool IsTextEmpty() const

     {
     {

-        return m_currentDate;
+        return m_combo->GetTextCtrl()->IsEmpty();

     }
 
     bool ParseDateTime(const wxString& s, wxDateTime* pDt)
     }
 
     bool ParseDateTime(const wxString& s, wxDateTime* pDt)


@@ -181,7 +127,7 @@ public:
 
         if ( !s.empty() )
         {
 
         if ( !s.empty() )
         {

-            pDt->ParseFormat(s, m_format);
+            pDt->ParseFormat(s.c_str(), m_format);

             if ( !pDt->IsValid() )
                 return false;
         }
             if ( !pDt->IsValid() )
                 return false;
         }


@@ -191,14 +137,10 @@ public:
 
     void SendDateEvent(const wxDateTime& dt)
     {
 
     void SendDateEvent(const wxDateTime& dt)
     {

-        //

         // Sends both wxCalendarEvent and wxDateEvent
         wxWindow* datePicker = m_combo->GetParent();
 
         // Sends both wxCalendarEvent and wxDateEvent
         wxWindow* datePicker = m_combo->GetParent();
 

-        wxCalendarEvent cev((wxCalendarCtrl*) this, wxEVT_CALENDAR_SEL_CHANGED);
-        cev.SetEventObject(datePicker);
-        cev.SetId(datePicker->GetId());
-        cev.SetDate(dt);
+        wxCalendarEvent cev(datePicker, dt, wxEVT_CALENDAR_SEL_CHANGED);

         datePicker->GetEventHandler()->ProcessEvent(cev);
 
         wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);
         datePicker->GetEventHandler()->ProcessEvent(cev);
 
         wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);


@@ -217,91 +159,119 @@ private:
 
     void OnSelChange(wxCalendarEvent &ev)
     {
 
     void OnSelChange(wxCalendarEvent &ev)
     {

-        m_currentDate = wxCalendarCtrl::GetDate();
-        m_combo->SetText(m_currentDate.Format(m_format));
+        m_combo->SetText(GetDate().Format(m_format));

 
         if ( ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED )
         {
             Dismiss();
         }
 
 
         if ( ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED )
         {
             Dismiss();
         }
 

-        SendDateEvent(m_currentDate);
+        SendDateEvent(GetDate());

     }
 
     void OnKillTextFocus(wxFocusEvent &ev)
     {
         ev.Skip();
 
     }
 
     void OnKillTextFocus(wxFocusEvent &ev)
     {
         ev.Skip();
 

+        const wxDateTime& dtOld = GetDate();
+

         wxDateTime dt;
         wxString value = m_combo->GetValue();
         if ( !ParseDateTime(value, &dt) )
         {
             if ( !HasDPFlag(wxDP_ALLOWNONE) )
         wxDateTime dt;
         wxString value = m_combo->GetValue();
         if ( !ParseDateTime(value, &dt) )
         {
             if ( !HasDPFlag(wxDP_ALLOWNONE) )

-                dt = m_currentDate;
+                dt = dtOld;

         }
 
         }
 

-        if ( dt.IsValid() )
-            m_combo->SetText(dt.Format(m_format));
-        else
-            m_combo->SetText(wxEmptyString);
+        m_combo->SetText(GetStringValueFor(dt));
+
+        if ( !dt.IsValid() && HasDPFlag(wxDP_ALLOWNONE) )
+            return;

 
         // notify that we had to change the date after validation
 
         // notify that we had to change the date after validation

-        if ( (dt.IsValid() && (!m_currentDate.IsValid() || m_currentDate != dt)) ||
-                (!dt.IsValid() && m_currentDate.IsValid()) )
+        if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) ||
+                (!dt.IsValid() && dtOld.IsValid()) )

         {
         {

-            m_currentDate = dt;
+            SetDate(dt);

             SendDateEvent(dt);
         }
     }
 
             SendDateEvent(dt);
         }
     }
 

-    bool HasDPFlag(int flag)
+    bool HasDPFlag(int flag) const

     {
         return m_combo->GetParent()->HasFlag(flag);
     }
 
     {
         return m_combo->GetParent()->HasFlag(flag);
     }
 

-    bool SetFormat(const wxChar *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;
 
         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 )
         {
 
         const wxChar *p = str.c_str();
         while ( *p )
         {

-            int n=wxAtoi(p);
-            if (n == dt.GetDay())
+            if (wxIsdigit(*p))

             {
             {

-                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())
-            {
-                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
                 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;
+
+        return x_format;
+    }
+
+    bool SetFormat(const wxString& fmt)
+    {
+        m_format = fmt;
+

         if ( m_combo )
         {
             wxArrayString allowedChars;
         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();
                 allowedChars.Add(wxString(c, 1));
 
             const wxChar *p2 = m_format.c_str();


@@ -319,8 +289,8 @@ private:
             m_combo->SetValidator(tv);
     #endif
 
             m_combo->SetValidator(tv);
     #endif
 

-            if (m_currentDate.IsValid())
-                m_combo->SetText(m_currentDate.Format(m_format));
+            if ( GetDate().IsValid() )
+                m_combo->SetText(GetDate().Format(m_format));

         }
 
         return true;
         }
 
         return true;


@@ -329,25 +299,30 @@ private:
     virtual void SetStringValue(const wxString& s)
     {
         wxDateTime dt;
     virtual void SetStringValue(const wxString& s)
     {
         wxDateTime dt;

-        if ( ParseDateTime(s, &dt) )
-            m_currentDate = dt;
-        else if ( HasDPFlag(wxDP_ALLOWNONE) )
-            m_currentDate = dt;
+        if ( !s.empty() && ParseDateTime(s, &dt) )
+            SetDate(dt);
+        //else: keep the old value

     }
 
     virtual wxString GetStringValue() const
     {
     }
 
     virtual wxString GetStringValue() const
     {

-        if ( !m_currentDate.IsValid() ) 
-            return wxEmptyString;
-
-        return m_currentDate.Format(m_format);
+        return GetStringValueFor(GetDate());

     }
 
 private:
     }
 
 private:

+    // returns either the given date representation using the current format or
+    // an empty string if it's invalid
+    wxString GetStringValueFor(const wxDateTime& dt) const
+    {
+        wxString val;
+        if ( dt.IsValid() )
+            val = dt.Format(m_format);
+
+        return val;
+    }

 
     wxSize          m_useSize;
     wxString        m_format;
 
     wxSize          m_useSize;
     wxString        m_format;

-    wxDateTime      m_currentDate;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -356,9 +331,7 @@ private:
 BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
     EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
     EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
 BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
     EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
     EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)

-    EVT_CALENDAR_DAY(wxID_ANY, wxCalendarComboPopup::OnSelChange)
-    EVT_CALENDAR_MONTH(wxID_ANY, wxCalendarComboPopup::OnSelChange)
-    EVT_CALENDAR_YEAR(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+    EVT_CALENDAR_PAGE_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)

     EVT_CALENDAR(wxID_ANY, wxCalendarComboPopup::OnSelChange)
 END_EVENT_TABLE()
 
     EVT_CALENDAR(wxID_ANY, wxCalendarComboPopup::OnSelChange)
 END_EVENT_TABLE()
 


@@ -391,7 +364,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),
                                      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,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxBORDER_NONE,


@@ -415,8 +388,6 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 #endif
     m_combo->SetPopupControl(m_popup);
 
 #endif
     m_combo->SetPopupControl(m_popup);
 

-    m_cal = m_popup;
-

     m_popup->SetDateValue(date.IsValid() ? date : wxDateTime::Today());
 
     SetInitialSize(size);
     m_popup->SetDateValue(date.IsValid() ? date : wxDateTime::Today());
 
     SetInitialSize(size);


@@ -428,7 +399,6 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 void wxDatePickerCtrlGeneric::Init()
 {
     m_combo = NULL;
 void wxDatePickerCtrlGeneric::Init()
 {
     m_combo = NULL;

-    m_cal = NULL;

     m_popup = NULL;
 }
 
     m_popup = NULL;
 }
 


@@ -442,7 +412,6 @@ bool wxDatePickerCtrlGeneric::Destroy()
         m_combo->Destroy();
 
     m_combo = NULL;
         m_combo->Destroy();
 
     m_combo = NULL;

-    m_cal = NULL;

     m_popup = NULL;
 
     return wxControl::Destroy();
     m_popup = NULL;
 
     return wxControl::Destroy();


@@ -465,13 +434,15 @@ bool
 wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
                                       const wxDateTime& upperdate)
 {
 wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
                                       const wxDateTime& upperdate)
 {

-    return m_cal->SetDateRange(lowerdate, upperdate);
+    return m_popup->SetDateRange(lowerdate, upperdate);

 }
 
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {
 }
 
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {

-    return m_popup->GetDateValue();
+    if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
+        return wxInvalidDateTime;
+    return m_popup->GetDate();

 }
 
 
 }
 
 


@@ -483,18 +454,19 @@ void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
 
 bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 {
 
 bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 {

-    if (dt1)
-        *dt1 = m_cal->GetLowerDateLimit();
-    if (dt2)
-        *dt2 = m_cal->GetUpperDateLimit();
-    return true;
+    return m_popup->GetDateRange(dt1, dt2);

 }
 
 
 void
 wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
 {
 }
 
 
 void
 wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
 {

-    m_cal->SetDateRange(dt1, dt2);
+    m_popup->SetDateRange(dt1, dt2);
+}
+
+wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
+{
+    return m_popup;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -520,7 +492,7 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
     // We'll create an additional event if the date is valid.
     // If the date isn't valid, the user's probably in the middle of typing
     wxDateTime dt;
     // We'll create an additional event if the date is valid.
     // If the date isn't valid, the user's probably in the middle of typing
     wxDateTime dt;

-    if ( !m_popup->ParseDateTime(m_combo->GetValue(), &dt) )
+    if ( !m_popup || !m_popup->ParseDateTime(m_combo->GetValue(), &dt) )

         return;
 
     m_popup->SendDateEvent(dt);
         return;
 
     m_popup->SendDateEvent(dt);


@@ -533,7 +505,5 @@ void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
 }
 
 
 }
 
 

-#endif // wxUSE_DATEPICKCTRL_GENERIC
-

 #endif // wxUSE_DATEPICKCTRL
 
 #endif // wxUSE_DATEPICKCTRL