]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/calctrl.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add comments explaining the workaround for mingw 3.2.3
[wxWidgets.git] / src / generic / calctrl.cpp
diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index b1e33170914cd3c5e911ddb02a9caa1130e498bd..f7ee6134f4490bd28721d3b7fbe780950b98df47 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     29.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "calctrl.h"
 #endif
 
     #pragma implementation "calctrl.h"
 #endif
 
@@ -33,6 +33,7 @@
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/combobox.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/combobox.h"
+    #include "wx/listbox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
 #endif //WX_PRECOMP
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
 #endif //WX_PRECOMP
@@ -41,6 +42,12 @@
 
 #include "wx/spinctrl.h"
 
 
 #include "wx/spinctrl.h"
 
+// if wxDatePickerCtrl code doesn't define the date event, do it here as we
+// need it as well
+#if !wxUSE_DATEPICKCTRL
+    #define _WX_DEFINE_DATE_EVENTS_
+#endif
+
 #include "wx/calctrl.h"
 
 #define DEBUG_PAINT 0
 #include "wx/calctrl.h"
 
 #define DEBUG_PAINT 0
@@ -60,6 +67,7 @@ private:
     wxCalendarCtrl *m_cal;
 
     DECLARE_EVENT_TABLE()
     wxCalendarCtrl *m_cal;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxMonthComboBox)
 };
 
 class wxYearSpinCtrl : public wxSpinCtrl
 };
 
 class wxYearSpinCtrl : public wxSpinCtrl
@@ -67,13 +75,18 @@ class wxYearSpinCtrl : public wxSpinCtrl
 public:
     wxYearSpinCtrl(wxCalendarCtrl *cal);
 
 public:
     wxYearSpinCtrl(wxCalendarCtrl *cal);
 
-    void OnYearTextChange(wxCommandEvent& event) { m_cal->OnYearChange(event); }
+    void OnYearTextChange(wxCommandEvent& event)
+    {
+        m_cal->SetUserChangedYear();
+        m_cal->OnYearChange(event);
+    }
     void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); }
 
 private:
     wxCalendarCtrl *m_cal;
 
     DECLARE_EVENT_TABLE()
     void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); }
 
 private:
     wxCalendarCtrl *m_cal;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxYearSpinCtrl)
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------
@@ -90,16 +103,72 @@ BEGIN_EVENT_TABLE(wxCalendarCtrl, wxControl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox)
-    EVT_COMBOBOX(-1, wxMonthComboBox::OnMonthChange)
+    EVT_COMBOBOX(wxID_ANY, wxMonthComboBox::OnMonthChange)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl)
-    EVT_TEXT(-1, wxYearSpinCtrl::OnYearTextChange)
-    EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange)
+    EVT_TEXT(wxID_ANY, wxYearSpinCtrl::OnYearTextChange)
+    EVT_SPINCTRL(wxID_ANY, wxYearSpinCtrl::OnYearChange)
 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxCalendarCtrlStyle )
+
+wxBEGIN_FLAGS( wxCalendarCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxCAL_SUNDAY_FIRST)
+    wxFLAGS_MEMBER(wxCAL_MONDAY_FIRST)
+    wxFLAGS_MEMBER(wxCAL_SHOW_HOLIDAYS)
+    wxFLAGS_MEMBER(wxCAL_NO_YEAR_CHANGE)
+    wxFLAGS_MEMBER(wxCAL_NO_MONTH_CHANGE)
+    wxFLAGS_MEMBER(wxCAL_SEQUENTIAL_MONTH_SELECTION)
+    wxFLAGS_MEMBER(wxCAL_SHOW_SURROUNDING_WEEKS)
+
+wxEND_FLAGS( wxCalendarCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl, wxControl,"wx/calctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxCalendarCtrl)
+    wxEVENT_RANGE_PROPERTY( Updated , wxEVT_CALENDAR_SEL_CHANGED , wxEVT_CALENDAR_WEEKDAY_CLICKED , wxCalendarEvent )
+    wxHIDE_PROPERTY( Children )
+    wxPROPERTY( Date,wxDateTime, SetDate , GetDate, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxCalendarCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxCalendarCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxCalendarCtrl , wxWindow* , Parent , wxWindowID , Id , wxDateTime , Date , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
 IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent)
+#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent)
 
 // ----------------------------------------------------------------------------
 // events
 
 // ----------------------------------------------------------------------------
 // events
@@ -121,7 +190,7 @@ DEFINE_EVENT_TYPE(wxEVT_CALENDAR_WEEKDAY_CLICKED)
 // ----------------------------------------------------------------------------
 
 wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
 // ----------------------------------------------------------------------------
 
 wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
-               : wxComboBox(cal->GetParent(), -1,
+               : wxComboBox(cal->GetParent(), wxID_ANY,
                             wxEmptyString,
                             wxDefaultPosition,
                             wxDefaultSize,
                             wxEmptyString,
                             wxDefaultPosition,
                             wxDefaultSize,
@@ -137,16 +206,21 @@ wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
     }
 
     SetSelection(m_cal->GetDate().GetMonth());
     }
 
     SetSelection(m_cal->GetDate().GetMonth());
-    SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
+    SetSize(wxDefaultCoord,
+            wxDefaultCoord,
+            wxDefaultCoord,
+            wxDefaultCoord,
+            wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
 }
 
 wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
 }
 
 wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
-              : wxSpinCtrl(cal->GetParent(), -1,
+              : wxSpinCtrl(cal->GetParent(), wxID_ANY,
                            cal->GetDate().Format(_T("%Y")),
                            wxDefaultPosition,
                            wxDefaultSize,
                            wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
                            -4300, 10000, cal->GetDate().GetYear())
                            cal->GetDate().Format(_T("%Y")),
                            wxDefaultPosition,
                            wxDefaultSize,
                            wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
                            -4300, 10000, cal->GetDate().GetYear())
+
 {
     m_cal = cal;
 }
 {
     m_cal = cal;
 }
@@ -164,7 +238,7 @@ wxCalendarCtrl::wxCalendarCtrl(wxWindow *parent,
                    const wxString& name)
 {
     Init();
                    const wxString& name)
 {
     Init();
-    
+
     (void)Create(parent, id, date, pos, size, style, name);
 }
 
     (void)Create(parent, id, date, pos, size, style, name);
 }
 
@@ -172,8 +246,10 @@ void wxCalendarCtrl::Init()
 {
     m_comboMonth = NULL;
     m_spinYear = NULL;
 {
     m_comboMonth = NULL;
     m_spinYear = NULL;
+    m_staticYear = NULL;
+    m_staticMonth = NULL;
 
 
-    m_userChangedYear = FALSE;
+    m_userChangedYear = false;
 
     m_widthCol =
     m_heightRow = 0;
 
     m_widthCol =
     m_heightRow = 0;
@@ -211,7 +287,7 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
                             wxDefaultValidator, name) )
     {
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
                             wxDefaultValidator, name) )
     {
-        return FALSE;
+        return false;
     }
 
     // needed to get the arrow keys normally used for the dialog navigation
     }
 
     // needed to get the arrow keys normally used for the dialog navigation
@@ -225,43 +301,31 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
     if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
     {
         m_spinYear = new wxYearSpinCtrl(this);
     if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
     {
         m_spinYear = new wxYearSpinCtrl(this);
-        m_staticYear = new wxStaticText(GetParent(), -1, m_date.Format(_T("%Y")),
+        m_staticYear = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%Y")),
                                         wxDefaultPosition, wxDefaultSize,
                                         wxALIGN_CENTRE);
 
         m_comboMonth = new wxMonthComboBox(this);
                                         wxDefaultPosition, wxDefaultSize,
                                         wxALIGN_CENTRE);
 
         m_comboMonth = new wxMonthComboBox(this);
-        m_staticMonth = new wxStaticText(GetParent(), -1, m_date.Format(_T("%B")),
+        m_staticMonth = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%B")),
                                          wxDefaultPosition, wxDefaultSize,
                                          wxALIGN_CENTRE);
     }
 
     ShowCurrentControls();
 
                                          wxDefaultPosition, wxDefaultSize,
                                          wxALIGN_CENTRE);
     }
 
     ShowCurrentControls();
 
-    wxSize sizeReal;
-    if ( size.x == -1 || size.y == -1 )
-    {
-        sizeReal = DoGetBestSize();
-        if ( size.x != -1 )
-            sizeReal.x = size.x;
-        if ( size.y != -1 )
-            sizeReal.y = size.y;
-    }
-    else
-    {
-        sizeReal = size;
-    }
-
     // we need to set the position as well because the main control position
     // is not the same as the one specified in pos if we have the controls
     // above it
     // we need to set the position as well because the main control position
     // is not the same as the one specified in pos if we have the controls
     // above it
-    SetSize(pos.x, pos.y, sizeReal.x, sizeReal.y);
+    SetBestSize(size);
+    SetPosition(pos);
 
 
-    SetBackgroundColour(*wxWHITE);
-    SetFont(*wxSWISS_FONT);
+    // Since we don't paint the whole background make sure that the platform
+    // will use the right one.
+    SetBackgroundColour(GetBackgroundColour());
 
     SetHolidayAttrs();
 
 
     SetHolidayAttrs();
 
-    return TRUE;
+    return true;
 }
 
 wxCalendarCtrl::~wxCalendarCtrl()
 }
 
 wxCalendarCtrl::~wxCalendarCtrl()
@@ -299,7 +363,7 @@ bool wxCalendarCtrl::Show(bool show)
 {
     if ( !wxControl::Show(show) )
     {
 {
     if ( !wxControl::Show(show) )
     {
-        return FALSE;
+        return false;
     }
 
     if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
     }
 
     if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
@@ -311,14 +375,14 @@ bool wxCalendarCtrl::Show(bool show)
         }
     }
 
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxCalendarCtrl::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
     {
 }
 
 bool wxCalendarCtrl::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
     {
-        return FALSE;
+        return false;
     }
 
     if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
     }
 
     if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
@@ -327,7 +391,7 @@ bool wxCalendarCtrl::Enable(bool enable)
         GetYearControl()->Enable(enable);
     }
 
         GetYearControl()->Enable(enable);
     }
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -418,7 +482,7 @@ void wxCalendarCtrl::EnableMonthChange(bool enable)
 
 bool wxCalendarCtrl::SetDate(const wxDateTime& date)
 {
 
 bool wxCalendarCtrl::SetDate(const wxDateTime& date)
 {
-    bool retval = TRUE;
+    bool retval = true;
 
     bool sameMonth = m_date.GetMonth() == date.GetMonth(),
          sameYear = m_date.GetYear() == date.GetYear();
 
     bool sameMonth = m_date.GetMonth() == date.GetMonth(),
          sameYear = m_date.GetYear() == date.GetYear();
@@ -446,8 +510,6 @@ bool wxCalendarCtrl::SetDate(const wxDateTime& date)
                     {
                         if ( !m_userChangedYear )
                             m_spinYear->SetValue(m_date.Format(_T("%Y")));
                     {
                         if ( !m_userChangedYear )
                             m_spinYear->SetValue(m_date.Format(_T("%Y")));
-                        else // don't overwrite what the user typed in
-                            m_userChangedYear = FALSE;
                     }
                 }
 
                     }
                 }
 
@@ -460,11 +522,13 @@ bool wxCalendarCtrl::SetDate(const wxDateTime& date)
             else
             {
                 // forbidden
             else
             {
                 // forbidden
-                retval = FALSE;
+                retval = false;
             }
         }
     }
 
             }
         }
     }
 
+    m_userChangedYear = false;
+
     return retval;
 }
 
     return retval;
 }
 
@@ -514,15 +578,15 @@ void wxCalendarCtrl::SetDateAndNotify(const wxDateTime& date)
 
 bool wxCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
 {
 
 bool wxCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
 {
-    bool retval = TRUE;
+    bool retval = true;
 
 
-    if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : TRUE ) )
+    if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) )
     {
         m_lowdate = date;
     }
     else
     {
     {
         m_lowdate = date;
     }
     else
     {
-        retval = FALSE;
+        retval = false;
     }
 
     return retval;
     }
 
     return retval;
@@ -530,15 +594,15 @@ bool wxCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDate
 
 bool wxCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
 {
 
 bool wxCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
 {
-    bool retval = TRUE;
+    bool retval = true;
 
 
-    if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE ) )
+    if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) )
     {
         m_highdate = date;
     }
     else
     {
     {
         m_highdate = date;
     }
     else
     {
-        retval = FALSE;
+        retval = false;
     }
 
     return retval;
     }
 
     return retval;
@@ -546,18 +610,18 @@ bool wxCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDate
 
 bool wxCalendarCtrl::SetDateRange(const wxDateTime& lowerdate /* = wxDefaultDateTime */, const wxDateTime& upperdate /* = wxDefaultDateTime */)
 {
 
 bool wxCalendarCtrl::SetDateRange(const wxDateTime& lowerdate /* = wxDefaultDateTime */, const wxDateTime& upperdate /* = wxDefaultDateTime */)
 {
-    bool retval = TRUE;
+    bool retval = true;
 
     if (
 
     if (
-        ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : TRUE ) ) &&
-        ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : TRUE ) ) )
+        ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : true ) ) &&
+        ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : true ) ) )
     {
         m_lowdate = lowerdate;
         m_highdate = upperdate;
     }
     else
     {
     {
         m_lowdate = lowerdate;
         m_highdate = upperdate;
     }
     else
     {
-        retval = FALSE;
+        retval = false;
     }
 
     return retval;
     }
 
     return retval;
@@ -597,22 +661,20 @@ bool wxCalendarCtrl::IsDateShown(const wxDateTime& date) const
     }
     else
     {
     }
     else
     {
-        return TRUE;
+        return true;
     }
 }
 
 bool wxCalendarCtrl::IsDateInRange(const wxDateTime& date) const
 {
     }
 }
 
 bool wxCalendarCtrl::IsDateInRange(const wxDateTime& date) const
 {
-    bool retval = TRUE;
     // Check if the given date is in the range specified
     // Check if the given date is in the range specified
-    retval = ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE )
-        && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : TRUE ) );
-    return retval;
+    return ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true )
+        && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) );
 }
 
 bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
 {
 }
 
 bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
 {
-    bool retval = FALSE;
+    bool retval = false;
 
     if ( !(IsDateInRange(*target)) )
     {
 
     if ( !(IsDateInRange(*target)) )
     {
@@ -621,7 +683,7 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
             if ( target->GetYear() >= GetLowerDateLimit().GetYear() )
             {
                 *target = GetLowerDateLimit();
             if ( target->GetYear() >= GetLowerDateLimit().GetYear() )
             {
                 *target = GetLowerDateLimit();
-                retval = TRUE;
+                retval = true;
             }
             else
             {
             }
             else
             {
@@ -633,7 +695,7 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
             if ( target->GetYear() <= GetUpperDateLimit().GetYear() )
             {
                 *target = GetUpperDateLimit();
             if ( target->GetYear() <= GetUpperDateLimit().GetYear() )
             {
                 *target = GetUpperDateLimit();
-                retval = TRUE;
+                retval = true;
             }
             else
             {
             }
             else
             {
@@ -643,7 +705,7 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
     }
     else
     {
     }
     else
     {
-        retval = TRUE;
+        retval = true;
     }
 
     return retval;
     }
 
     return retval;
@@ -651,11 +713,11 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
 
 bool wxCalendarCtrl::ChangeMonth(wxDateTime* target) const
 {
 
 bool wxCalendarCtrl::ChangeMonth(wxDateTime* target) const
 {
-    bool retval = TRUE;
+    bool retval = true;
 
     if ( !(IsDateInRange(*target)) )
     {
 
     if ( !(IsDateInRange(*target)) )
     {
-        retval = FALSE;
+        retval = false;
 
         if ( target->GetMonth() < m_date.GetMonth() )
         {
 
         if ( target->GetMonth() < m_date.GetMonth() )
         {
@@ -737,7 +799,9 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
         width += 4;
     }
 
         width += 4;
     }
 
-    return wxSize(width, height);
+    wxSize best(width, height);
+    CacheBestSize(best);
+    return best;
 }
 
 void wxCalendarCtrl::DoSetSize(int x, int y,
 }
 
 void wxCalendarCtrl::DoSetSize(int x, int y,
@@ -755,9 +819,39 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
     {
         wxSize sizeCombo = m_comboMonth->GetSize();
         wxSize sizeStatic = m_staticMonth->GetSize();
     {
         wxSize sizeCombo = m_comboMonth->GetSize();
         wxSize sizeStatic = m_staticMonth->GetSize();
-
+        wxSize sizeSpin = m_spinYear->GetSize();
         int dy = (sizeCombo.y - sizeStatic.y) / 2;
         int dy = (sizeCombo.y - sizeStatic.y) / 2;
-
+/*
+In the calender the size of the combobox for the year
+is just defined by a margin from the month combobox to
+the left border. While in wxUniv the year control can't
+show all 4 digits, in wxMsw it show almost twice as
+much. Instead the year should use it's best size and be
+left aligned to the calendar. Just in case the month in
+any language is longer than it has space in the
+calendar it is shortend.This way the year always can
+show the 4 digits.
+
+This patch relies on the fact that a combobox has a
+good best size implementation. This is not the case
+with wxMSW but I don't know why.
+
+Otto Wyss
+*/
+
+#ifdef __WXUNIVERSAL__
+        if (sizeCombo.x + HORZ_MARGIN - sizeSpin.x > width)
+        {
+            m_comboMonth->SetSize(x, y, width - HORZ_MARGIN - sizeSpin.x, sizeCombo.y);
+        }
+        else
+        {
+            m_comboMonth->Move(x, y);
+        }
+        m_staticMonth->Move(x, y + dy);
+        m_spinYear->Move(x + width - sizeSpin.x, y);
+        m_staticYear->Move(x + width - sizeSpin.x, y + dy);
+#else
         m_comboMonth->Move(x, y);
         m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
 
         m_comboMonth->Move(x, y);
         m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
 
@@ -765,8 +859,7 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 
         m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
         m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
 
         m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
         m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
-
-        wxSize sizeSpin = m_spinYear->GetSize();
+#endif
         yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
     }
     else // no controls on the top
         yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
     }
     else // no controls on the top
@@ -807,12 +900,9 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const
 
 void wxCalendarCtrl::RecalcGeometry()
 {
 
 void wxCalendarCtrl::RecalcGeometry()
 {
-    if ( m_widthCol != 0 )
-        return;
-
     wxClientDC dc(this);
 
     wxClientDC dc(this);
 
-    dc.SetFont(m_font);
+    dc.SetFont(GetFont());
 
     // determine the column width (we assume that the weekday names are always
     // wider (in any language) than the numbers)
 
     // determine the column width (we assume that the weekday names are always
     // wider (in any language) than the numbers)
@@ -843,7 +933,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 
-    dc.SetFont(m_font);
+    dc.SetFont(GetFont());
 
     RecalcGeometry();
 
 
     RecalcGeometry();
 
@@ -863,7 +953,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.SetTextForeground(*wxBLACK);
         dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
         dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));
         dc.SetTextForeground(*wxBLACK);
         dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
         dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));
-        dc.DrawRectangle(0, y, 7*m_widthCol, m_heightRow);
+        dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);
 
         // Get extent of month-name + year
         wxCoord monthw, monthh;
 
         // Get extent of month-name + year
         wxCoord monthw, monthh;
@@ -885,7 +975,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         leftarrow[1] = wxPoint(arrowheight / 2, 0);
         leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
 
         leftarrow[1] = wxPoint(arrowheight / 2, 0);
         leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
 
-        rightarrow[0] = wxPoint(0, 0);
+        rightarrow[0] = wxPoint(0,0);
         rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
         rightarrow[2] = wxPoint(0, arrowheight - 1);
 
         rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
         rightarrow[2] = wxPoint(0, arrowheight - 1);
 
@@ -894,14 +984,13 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         wxCoord arrowy = (m_heightRow - arrowheight) / 2;
         wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2;
         wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;
         wxCoord arrowy = (m_heightRow - arrowheight) / 2;
         wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2;
         wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;
-        m_leftArrowRect = wxRect(0, 0, 0, 0);
-        m_rightArrowRect = wxRect(0, 0, 0, 0);
+        m_leftArrowRect = m_rightArrowRect = wxRect(0,0,0,0);
 
         if ( AllowMonthChange() )
         {
             wxDateTime ldpm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) - wxDateSpan::Day(); // last day prev month
             // Check if range permits change
 
         if ( AllowMonthChange() )
         {
             wxDateTime ldpm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) - wxDateSpan::Day(); // last day prev month
             // Check if range permits change
-            if ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? TRUE : AllowYearChange() ) )
+            if ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) )
             {
                 m_leftArrowRect = wxRect(larrowx - 3, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
                 dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
             {
                 m_leftArrowRect = wxRect(larrowx - 3, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
                 dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
@@ -911,7 +1000,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                 dc.DrawRectangle(m_leftArrowRect);
             }
             wxDateTime fdnm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) + wxDateSpan::Month(); // first day next month
                 dc.DrawRectangle(m_leftArrowRect);
             }
             wxDateTime fdnm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) + wxDateSpan::Month(); // first day next month
-            if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? TRUE : AllowYearChange() ) )
+            if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) )
             {
                 m_rightArrowRect = wxRect(rarrowx - 4, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
                 dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
             {
                 m_rightArrowRect = wxRect(rarrowx - 4, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
                 dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
@@ -989,10 +1078,10 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                 wxCoord width;
                 dc.GetTextExtent(dayStr, &width, (wxCoord *)NULL);
 
                 wxCoord width;
                 dc.GetTextExtent(dayStr, &width, (wxCoord *)NULL);
 
-                bool changedColours = FALSE,
-                     changedFont = FALSE;
+                bool changedColours = false,
+                     changedFont = false;
 
 
-                bool isSel = FALSE;
+                bool isSel = false;
                 wxCalendarDateAttr *attr = NULL;
 
                 if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) )
                 wxCalendarDateAttr *attr = NULL;
 
                 if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) )
@@ -1000,7 +1089,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                     // surrounding week or out-of-range
                     // draw "disabled"
                     dc.SetTextForeground(*wxLIGHT_GREY);
                     // surrounding week or out-of-range
                     // draw "disabled"
                     dc.SetTextForeground(*wxLIGHT_GREY);
-                    changedColours = TRUE;
+                    changedColours = true;
                 }
                 else
                 {
                 }
                 else
                 {
@@ -1012,7 +1101,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                         dc.SetTextForeground(m_colHighlightFg);
                         dc.SetTextBackground(m_colHighlightBg);
 
                         dc.SetTextForeground(m_colHighlightFg);
                         dc.SetTextBackground(m_colHighlightBg);
 
-                        changedColours = TRUE;
+                        changedColours = true;
                     }
                     else if ( attr )
                     {
                     }
                     else if ( attr )
                     {
@@ -1032,19 +1121,19 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                         if ( colFg.Ok() )
                         {
                             dc.SetTextForeground(colFg);
                         if ( colFg.Ok() )
                         {
                             dc.SetTextForeground(colFg);
-                            changedColours = TRUE;
+                            changedColours = true;
                         }
 
                         if ( colBg.Ok() )
                         {
                             dc.SetTextBackground(colBg);
                         }
 
                         if ( colBg.Ok() )
                         {
                             dc.SetTextBackground(colBg);
-                            changedColours = TRUE;
+                            changedColours = true;
                         }
 
                         if ( attr->HasFont() )
                         {
                             dc.SetFont(attr->GetFont());
                         }
 
                         if ( attr->HasFont() )
                         {
                             dc.SetFont(attr->GetFont());
-                            changedFont = TRUE;
+                            changedFont = true;
                         }
                     }
                 }
                         }
                     }
                 }
@@ -1061,7 +1150,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                     }
                     else
                     {
                     }
                     else
                     {
-                        colBorder = m_foregroundColour;
+                        colBorder = GetForegroundColour();
                     }
 
                     wxPen pen(colBorder, 1, wxSOLID);
                     }
 
                     wxPen pen(colBorder, 1, wxSOLID);
@@ -1087,13 +1176,13 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 
                 if ( changedColours )
                 {
 
                 if ( changedColours )
                 {
-                    dc.SetTextForeground(m_foregroundColour);
-                    dc.SetTextBackground(m_backgroundColour);
+                    dc.SetTextForeground(GetForegroundColour());
+                    dc.SetTextBackground(GetBackgroundColour());
                 }
 
                 if ( changedFont )
                 {
                 }
 
                 if ( changedFont )
                 {
-                    dc.SetFont(m_font);
+                    dc.SetFont(GetFont());
                 }
             }
             //else: just don't draw it
                 }
             }
             //else: just don't draw it
@@ -1164,7 +1253,7 @@ void wxCalendarCtrl::RefreshDate(const wxDateTime& date)
            rect.x + rect.width, rect.y + rect.height);
 #endif
 
            rect.x + rect.width, rect.y + rect.height);
 #endif
 
-    Refresh(TRUE, &rect);
+    Refresh(true, &rect);
 }
 
 void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pPen, wxBrush* pBrush)
 }
 
 void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pPen, wxBrush* pBrush)
@@ -1258,7 +1347,7 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate,
 
 bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) const
 {
 
 bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) const
 {
-    bool retval = TRUE;
+    bool retval = true;
 
 #if DEBUG_PAINT
     wxLogDebug("+++ GetDateCoord: (%s) +++", date.Format("%d %m %Y"));
 
 #if DEBUG_PAINT
     wxLogDebug("+++ GetDateCoord: (%s) +++", date.Format("%d %m %Y"));
@@ -1277,7 +1366,7 @@ bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) c
         }
         else
         {
         }
         else
         {
-            day += ( startOnMonday ) ? 0 : 1;
+            *day += ( startOnMonday ) ? 0 : 1;
         }
 
         int targetmonth = date.GetMonth() + (12 * date.GetYear());
         }
 
         int targetmonth = date.GetMonth() + (12 * date.GetYear());
@@ -1335,7 +1424,7 @@ bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) c
     {
         *day = -1;
         *week = -1;
     {
         *day = -1;
         *week = -1;
-        retval = FALSE;
+        retval = false;
     }
 
 #if DEBUG_PAINT
     }
 
 #if DEBUG_PAINT
@@ -1537,10 +1626,6 @@ void wxCalendarCtrl::OnYearChange(wxCommandEvent& event)
         return;
     }
 
         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();
 
     if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) )
     wxDateTime::Tm tm = m_date.GetTm();
 
     if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) )
@@ -1569,7 +1654,7 @@ void wxCalendarCtrl::OnYearChange(wxCommandEvent& event)
 void wxCalendarCtrl::OnChar(wxKeyEvent& event)
 {
     wxDateTime target;
 void wxCalendarCtrl::OnChar(wxKeyEvent& event)
 {
     wxDateTime target;
-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )
     {
         case _T('+'):
         case WXK_ADD:
     {
         case _T('+'):
         case WXK_ADD:
@@ -1714,7 +1799,7 @@ void wxCalendarCtrl::SetHoliday(size_t day)
         attr = new wxCalendarDateAttr;
     }
 
         attr = new wxCalendarDateAttr;
     }
 
-    attr->SetHoliday(TRUE);
+    attr->SetHoliday(true);
 
     // can't use SetAttr() because it would delete this pointer
     m_attrs[day - 1] = attr;
 
     // can't use SetAttr() because it would delete this pointer
     m_attrs[day - 1] = attr;
@@ -1726,25 +1811,18 @@ void wxCalendarCtrl::ResetHolidayAttrs()
     {
         if ( m_attrs[day] )
         {
     {
         if ( m_attrs[day] )
         {
-            m_attrs[day]->SetHoliday(FALSE);
+            m_attrs[day]->SetHoliday(false);
         }
     }
 }
 
         }
     }
 }
 
-// ----------------------------------------------------------------------------
-// wxCalendarEvent
-// ----------------------------------------------------------------------------
-
-void wxCalendarEvent::Init()
-{
-    m_wday = wxDateTime::Inv_WeekDay;
-}
 
 
-wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type)
-               : wxCommandEvent(type, cal->GetId())
+//static
+wxVisualAttributes
+wxCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 {
 {
-    m_date = cal->GetDate();
-    SetEventObject(cal);
+    // Use the same color scheme as wxListBox
+    return wxListBox::GetClassDefaultAttributes(variant);
 }
 
 #endif // wxUSE_CALENDARCTRL
 }
 
 #endif // wxUSE_CALENDARCTRL
wxWidgets (Impactor)