Finished initial review of [v*] interface headers.

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 2626290a3bd53f0bad9608f55224c8b5f2ab3444..c451b1734792aa4cf2414acc27d03e49014ba6a3 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -44,16 +44,12 @@
     // 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"
     // 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/calctrl.h"
 #endif
 
 #include "wx/dateevt.h"
 
 #include "wx/calctrl.h"

+#include "wx/generic/calctrlg.h"

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


@@ -75,12 +71,12 @@
 // local classes
 // ----------------------------------------------------------------------------
 
 // local classes
 // ----------------------------------------------------------------------------
 

-class wxCalendarComboPopup : public wxCalendarCtrl,
+class wxCalendarComboPopup : public wxGenericCalendarCtrl,

                              public wxComboPopup
 {
 public:
 
                              public wxComboPopup
 {
 public:
 

-    wxCalendarComboPopup() : wxCalendarCtrl(),
+    wxCalendarComboPopup() : wxGenericCalendarCtrl(),

                              wxComboPopup()
     {
     }
                              wxComboPopup()
     {
     }


@@ -94,12 +90,12 @@ public:
     //     certainly introduce new bugs.
     virtual bool Create(wxWindow* parent)
     {
     //     certainly introduce new bugs.
     virtual bool Create(wxWindow* parent)
     {

-        if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
+        if ( !wxGenericCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,

                               wxPoint(0, 0), wxDefaultSize,
                               wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
             return false;
 
                               wxPoint(0, 0), wxDefaultSize,
                               wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
             return false;
 

-        wxWindow *yearControl = wxCalendarCtrl::GetYearControl();
+        wxWindow *yearControl = wxGenericCalendarCtrl::GetYearControl();

 
         wxClientDC dc(yearControl);
         dc.SetFont(yearControl->GetFont());
 
         wxClientDC dc(yearControl);
         dc.SetFont(yearControl->GetFont());


@@ -107,13 +103,13 @@ public:
         dc.GetTextExtent(wxT("2000"), &width, &dummy);
         width += ConvertDialogToPixels(wxSize(20, 0)).x;
 
         dc.GetTextExtent(wxT("2000"), &width, &dummy);
         width += ConvertDialogToPixels(wxSize(20, 0)).x;
 

-        wxSize calSize = wxCalendarCtrl::GetBestSize();
+        wxSize calSize = wxGenericCalendarCtrl::GetBestSize();

         wxSize yearSize = yearControl->GetSize();
         yearSize.x = width;
 
         wxPoint yearPosition = yearControl->GetPosition();
 
         wxSize yearSize = yearControl->GetSize();
         yearSize.x = width;
 
         wxPoint yearPosition = yearControl->GetPosition();
 

-        SetFormat(wxT("%x"));
+        SetFormat("%x");

 
         width = yearPosition.x + yearSize.x+2+CALBORDER/2;
         if (width < calSize.x-4)
 
         width = yearPosition.x + yearSize.x+2+CALBORDER/2;
         if (width < calSize.x-4)


@@ -125,10 +121,10 @@ public:
             calPos = 0;
             width += 2;
         }
             calPos = 0;
             width += 2;
         }

-        wxCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);
+        wxGenericCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);

         yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
                              yearSize.x, yearSize.y);
         yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
                              yearSize.x, yearSize.y);

-        wxCalendarCtrl::GetMonthControl()->Move(0, 0);
+        wxGenericCalendarCtrl::GetMonthControl()->Move(0, 0);

 
         m_useSize.x = width+CALBORDER/2;
         m_useSize.y = calSize.y-2+CALBORDER;
 
         m_useSize.x = width+CALBORDER/2;
         m_useSize.y = calSize.y-2+CALBORDER;


@@ -167,12 +163,7 @@ public:
             m_combo->SetText(wxEmptyString);
         }
 
             m_combo->SetText(wxEmptyString);
         }
 

-        m_currentDate = date;
-    }
-
-    const wxDateTime& GetDateValue() const
-    {
-        return m_currentDate;
+        SetDate(date);

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


@@ -181,7 +172,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,18 +182,14 @@ 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);
-        GetParent()->GetEventHandler()->ProcessEvent(cev);
+        wxCalendarEvent cev(datePicker, dt, wxEVT_CALENDAR_SEL_CHANGED);
+        datePicker->GetEventHandler()->ProcessEvent(cev);

 
         wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);
 
         wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);

-        datePicker->GetParent()->GetEventHandler()->ProcessEvent(event);
+        datePicker->GetEventHandler()->ProcessEvent(event);

     }
 
 private:
     }
 
 private:


@@ -217,39 +204,37 @@ 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));

 
         // 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);
         }
     }


@@ -259,7 +244,7 @@ private:
         return m_combo->GetParent()->HasFlag(flag);
     }
 
         return m_combo->GetParent()->HasFlag(flag);
     }
 

-    bool SetFormat(const wxChar *fmt)
+    bool SetFormat(const wxString& fmt)

     {
         m_format.clear();
 
     {
         m_format.clear();
 


@@ -319,8 +304,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;


@@ -330,35 +315,40 @@ private:
     {
         wxDateTime dt;
         if ( ParseDateTime(s, &dt) )
     {
         wxDateTime dt;
         if ( ParseDateTime(s, &dt) )

-            m_currentDate = dt;
+            SetDate(dt);

         else if ( HasDPFlag(wxDP_ALLOWNONE) )
         else if ( HasDPFlag(wxDP_ALLOWNONE) )

-            m_currentDate = dt;
+            SetDate(wxInvalidDateTime);
+        //else: !wxDP_ALLOWNONE, 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()
 };
 
 

-BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
+BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxGenericCalendarCtrl)

     EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
     EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
     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()
 


@@ -415,8 +405,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 +416,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 +429,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 +451,13 @@ 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();
+    return m_popup->GetDate();

 }
 
 
 }
 
 


@@ -484,9 +470,9 @@ void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
 bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 {
     if (dt1)
 bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 {
     if (dt1)

-        *dt1 = m_cal->GetLowerDateLimit();
+        *dt1 = m_popup->GetLowerDateLimit();

     if (dt2)
     if (dt2)

-        *dt2 = m_cal->GetUpperDateLimit();
+        *dt2 = m_popup->GetUpperDateLimit();

     return true;
 }
 
     return true;
 }
 


@@ -494,7 +480,12 @@ bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 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);
+}
+
+wxGenericCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
+{
+    return m_popup;

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