Reverted previous 'fixes' now that the array bug has been cured

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 176bc6e0f9470e341f8dde76bf69fef103240c1a..61eeb947082ae83538ecf44c092a60f9c17125ef 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -34,10 +34,13 @@
     #include "wx/brush.h"
     #include "wx/combobox.h"
     #include "wx/stattext.h"
+    #include "wx/textctrl.h"
 #endif //WX_PRECOMP
 
 #if wxUSE_CALENDARCTRL
 
+#include "wx/spinctrl.h"
+
 #include "wx/calctrl.h"
 
 #define DEBUG_PAINT 0
@@ -64,6 +67,7 @@ class wxYearSpinCtrl : public wxSpinCtrl
 public:
     wxYearSpinCtrl(wxCalendarCtrl *cal);
 
+    void OnYearTextChange(wxCommandEvent& event) { m_cal->OnYearChange(event); }
     void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); }
 
 private:
@@ -90,6 +94,7 @@ BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl)
+    EVT_TEXT(-1, wxYearSpinCtrl::OnYearTextChange)
     EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange)
 END_EVENT_TABLE()
 
@@ -155,6 +160,8 @@ void wxCalendarCtrl::Init()
     m_comboMonth = NULL;
     m_spinYear = NULL;
 
+    m_userChangedYear = FALSE;
+
     m_widthCol =
     m_heightRow = 0;
 
@@ -258,12 +265,19 @@ wxCalendarCtrl::~wxCalendarCtrl()
 
 bool wxCalendarCtrl::Destroy()
 {
-    if( m_staticYear ) m_staticYear->Destroy();
-    if( m_spinYear ) m_spinYear->Destroy();
-    if( m_comboMonth ) m_comboMonth->Destroy();
-    if( m_staticMonth ) m_staticMonth->Destroy();
-
-    m_staticYear = 0; m_spinYear = 0; m_comboMonth = 0; m_staticMonth = 0;
+    if ( m_staticYear )
+        m_staticYear->Destroy();
+    if ( m_spinYear )
+        m_spinYear->Destroy();
+    if ( m_comboMonth )
+        m_comboMonth->Destroy();
+    if ( m_staticMonth )
+        m_staticMonth->Destroy();
+
+    m_staticYear = NULL;
+    m_spinYear = NULL;
+    m_comboMonth = NULL;
+    m_staticMonth = NULL;
 
     return wxControl::Destroy();
 }
@@ -391,7 +405,7 @@ void wxCalendarCtrl::EnableMonthChange(bool enable)
 
 bool wxCalendarCtrl::SetDate(const wxDateTime& date)
 {
-    bool retval = FALSE;
+    bool retval = TRUE;
 
     bool sameMonth = m_date.GetMonth() == date.GetMonth(),
          sameYear = m_date.GetYear() == date.GetYear();
@@ -401,37 +415,40 @@ bool wxCalendarCtrl::SetDate(const wxDateTime& date)
         if ( sameMonth && sameYear )
         {
             // just change the day
-            retval = TRUE;
             ChangeDay(date);
         }
         else
         {
-            if ( !AllowMonthChange() || (!AllowYearChange() && !sameYear) )
-            {
-                // forbidden
-                return retval;
-            }
-
-            // change everything
-            retval = TRUE;
-            m_date = date;
-
-            if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+            if ( AllowMonthChange() && (AllowYearChange() || sameYear) )
             {
-                // update the controls
-                m_comboMonth->SetSelection(m_date.GetMonth());
+                // change everything
+                m_date = date;
 
-                if ( AllowYearChange() )
+                if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
                 {
-                    m_spinYear->SetValue(m_date.Format(_T("%Y")));
+                    // update the controls
+                    m_comboMonth->SetSelection(m_date.GetMonth());
+
+                    if ( AllowYearChange() )
+                    {
+                        if ( !m_userChangedYear )
+                            m_spinYear->SetValue(m_date.Format(_T("%Y")));
+                        else // don't overwrite what the user typed in
+                            m_userChangedYear = FALSE;
+                    }
                 }
-            }
 
-            // as the month changed, holidays did too
-            SetHolidayAttrs();
+                // as the month changed, holidays did too
+                SetHolidayAttrs();
 
-            // update the calendar
-            Refresh();
+                // update the calendar
+                Refresh();
+            }
+            else
+            {
+                // forbidden
+                retval = FALSE;
+            }
         }
     }
 
@@ -680,8 +697,11 @@ size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const
 
 // the constants used for the layout
 #define VERT_MARGIN     5           // distance between combo and calendar
+#ifdef __WXMAC__
+#define HORZ_MARGIN    5           //                            spin
+#else
 #define HORZ_MARGIN    15           //                            spin
-
+#endif
 wxSize wxCalendarCtrl::DoGetBestSize() const
 {
     // calc the size of the calendar
@@ -765,7 +785,7 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const
     if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
     {
         // our real height is bigger
-        if ( height )
+        if ( height && GetMonthControl())
         {
             *height += GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
@@ -1495,11 +1515,21 @@ void wxCalendarCtrl::OnMonthChange(wxCommandEvent& event)
     SetDateAndNotify(target);
 }
 
-void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
+void wxCalendarCtrl::OnYearChange(wxCommandEvent& event)
 {
+    int year = (int)event.GetInt();
+    if ( year == INT_MIN )
+    {
+        // invalid year in the spin control, ignore it
+        return;
+    }
+
+    // set the flag for SetDate(): otherwise it would overwrite the year
+    // typed in by the user
+    m_userChangedYear = TRUE;
+
     wxDateTime::Tm tm = m_date.GetTm();
 
-    int year = (int)event.GetInt();
     if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) )
     {
         tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
@@ -1517,7 +1547,6 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
         // inside the same year but a strange number of months forward/back..
         m_spinYear->SetValue(target.GetYear());
     }
-
 }
 
 // ----------------------------------------------------------------------------