ignore WinCE projects and build directories

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index d22073d67e178bcee13029eb1621315f71b80c5c..5028bb79b03f20848d8eb6843b027e0d90490acb 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -70,14 +70,6 @@
 // global variables
 // ----------------------------------------------------------------------------
 
 // global variables
 // ----------------------------------------------------------------------------
 

-// this should have been a flag in wxDatePickerCtrlGeneric itself but adding it
-// there now would break backwards compatibility, so put it here as a global:
-// this shouldn't be a big problem as only one (GUI) thread normally can call
-// wxDatePickerCtrlGeneric::SetValue() and so it can be only ever used for one
-// control at a time
-//
-// if the value is not NULL, it points to the control which is inside SetValue()
-static wxDatePickerCtrlGeneric *gs_inSetValue = NULL;

 
 // ----------------------------------------------------------------------------
 // local classes
 
 // ----------------------------------------------------------------------------
 // local classes


@@ -121,7 +113,7 @@ public:
 
         wxPoint yearPosition = yearControl->GetPosition();
 
 
         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)


@@ -175,12 +167,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)


@@ -189,7 +176,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;
         }


@@ -207,10 +194,10 @@ public:
         cev.SetEventObject(datePicker);
         cev.SetId(datePicker->GetId());
         cev.SetDate(dt);
         cev.SetEventObject(datePicker);
         cev.SetId(datePicker->GetId());
         cev.SetDate(dt);

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

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

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

     }
 
 private:
     }
 
 private:


@@ -225,39 +212,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);
         }
     }


@@ -267,7 +252,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();
 


@@ -327,8 +312,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;


@@ -338,24 +323,31 @@ 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()
 };


@@ -378,6 +370,7 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
     EVT_TEXT(wxID_ANY, wxDatePickerCtrlGeneric::OnText)
     EVT_SIZE(wxDatePickerCtrlGeneric::OnSize)
 BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
     EVT_TEXT(wxID_ANY, wxDatePickerCtrlGeneric::OnText)
     EVT_SIZE(wxDatePickerCtrlGeneric::OnSize)

+    EVT_SET_FOCUS(wxDatePickerCtrlGeneric::OnFocus)

 END_EVENT_TABLE()
 
 #ifndef wxHAS_NATIVE_DATEPICKCTRL
 END_EVENT_TABLE()
 
 #ifndef wxHAS_NATIVE_DATEPICKCTRL


@@ -412,15 +405,19 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
     m_combo = new wxComboCtrl(this, -1, wxEmptyString,
                               wxDefaultPosition, wxDefaultSize);
 
     m_combo = new wxComboCtrl(this, -1, wxEmptyString,
                               wxDefaultPosition, wxDefaultSize);
 

+    m_combo->SetCtrlMainWnd(this);
+

     m_popup = new wxCalendarComboPopup();
 
     m_popup = new wxCalendarComboPopup();
 

+#if defined(__WXMSW__)
+    // without this keyboard navigation in month control doesn't work
+    m_combo->UseAltPopupWindow();
+#endif

     m_combo->SetPopupControl(m_popup);
 
     m_combo->SetPopupControl(m_popup);
 

-    m_cal = m_popup;
-

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

-    SetBestFittingSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -429,7 +426,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;
 }
 


@@ -443,7 +439,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();


@@ -466,13 +461,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();

 }
 
 
 }
 
 


@@ -485,9 +480,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;
 }
 


@@ -495,7 +490,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);
+}
+
+wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
+{
+    return m_popup;

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


@@ -516,7 +516,7 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
 {
     ev.SetEventObject(this);
     ev.SetId(GetId());
 {
     ev.SetEventObject(this);
     ev.SetId(GetId());

-    GetParent()->ProcessEvent(ev);
+    GetParent()->GetEventHandler()->ProcessEvent(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
 
     // 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


@@ -528,6 +528,12 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
 }
 
 
 }
 
 

+void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
+{
+    m_combo->SetFocus();
+}
+
+

 #endif // wxUSE_DATEPICKCTRL_GENERIC
 
 #endif // wxUSE_DATEPICKCTRL
 #endif // wxUSE_DATEPICKCTRL_GENERIC
 
 #endif // wxUSE_DATEPICKCTRL