don't dereference NULL parent in wxMDIChildFrame dtor if it hadn't been really created

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 78b6c57f49f50dc1d8fe34f4fe96170d1c37ec7b..a76d41f1b8f080f77285111437aacc29b7b472b4 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/calctrl.cpp
+// Name:        src/generic/calctrl.cpp

 // Purpose:     implementation fo the generic wxCalendarCtrl
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     implementation fo the generic wxCalendarCtrl
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "calctrl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,41 +28,25 @@
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/dcclient.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
 
 #endif //WX_PRECOMP
 

-#include "wx/calctrl.h"
-
-#define DEBUG_PAINT 0
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class wxMonthComboBox : public wxComboBox
-{
-public:
-    wxMonthComboBox(wxCalendarCtrl *cal);
-
-    void OnMonthChange(wxCommandEvent& event) { m_cal->OnMonthChange(event); }
-
-private:
-    wxCalendarCtrl *m_cal;
+#if wxUSE_CALENDARCTRL

 
 

-    DECLARE_EVENT_TABLE()
-};
+#include "wx/spinctrl.h"

 
 

-class wxYearSpinCtrl : public wxSpinCtrl
-{
-public:
-    wxYearSpinCtrl(wxCalendarCtrl *cal);
-
-    void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); }
+// 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

 
 

-private:
-    wxCalendarCtrl *m_cal;
+#include "wx/calctrl.h"

 
 

-    DECLARE_EVENT_TABLE()
-};
+#define DEBUG_PAINT 0

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -79,64 +59,109 @@ BEGIN_EVENT_TABLE(wxCalendarCtrl, wxControl)
 
     EVT_LEFT_DOWN(wxCalendarCtrl::OnClick)
     EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick)
 
     EVT_LEFT_DOWN(wxCalendarCtrl::OnClick)
     EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick)

-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox)
-    EVT_COMBOBOX(-1, wxMonthComboBox::OnMonthChange)
-END_EVENT_TABLE()

 
 

-BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl)
-    EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange)
+    EVT_SYS_COLOUR_CHANGED(wxCalendarCtrl::OnSysColourChanged)

 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)

+#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent)
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_DAY_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_MONTH_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_YEAR_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_WEEKDAY_CLICKED)

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// wxMonthComboBox and wxYearSpinCtrl
+// wxCalendarCtrl

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
-               : wxComboBox(cal->GetParent(), -1,
-                            wxEmptyString,
-                            wxDefaultPosition,
-                            wxDefaultSize,
-                            0, NULL,
-                            wxCB_READONLY)
+wxCalendarCtrl::wxCalendarCtrl(wxWindow *parent,
+                   wxWindowID id,
+                   const wxDateTime& date,
+                   const wxPoint& pos,
+                   const wxSize& size,
+                   long style,
+                   const wxString& name)

 {
 {

-    m_cal = cal;
-
-    wxDateTime::Month m;
-    for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
-    {
-        Append(wxDateTime::GetMonthName(m));
-    }
+    Init();

 
 

-    SetSelection(m_cal->GetDate().GetMonth());
+    (void)Create(parent, id, date, pos, size, style, name);

 }
 
 }
 

-wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
-              : wxSpinCtrl(cal->GetParent(), -1,
-                           cal->GetDate().Format(_T("%Y")),
-                           wxDefaultPosition,
-                           wxDefaultSize,
-                           wxSP_ARROW_KEYS,
-                           -4300, 10000, cal->GetDate().GetYear())
-{
-    m_cal = cal;
-}
-
-// ----------------------------------------------------------------------------
-// wxCalendarCtrl
-// ----------------------------------------------------------------------------
-

 void wxCalendarCtrl::Init()
 {
     m_comboMonth = NULL;
     m_spinYear = NULL;
 void wxCalendarCtrl::Init()
 {
     m_comboMonth = NULL;
     m_spinYear = NULL;

+    m_staticYear = NULL;
+    m_staticMonth = NULL;
+
+    m_userChangedYear = false;

 
     m_widthCol =
     m_heightRow = 0;
 
     m_widthCol =
     m_heightRow = 0;


@@ -146,107 +171,353 @@ void wxCalendarCtrl::Init()
     {
         m_weekdays[wd] = wxDateTime::GetWeekDayName(wd, wxDateTime::Name_Abbr);
     }
     {
         m_weekdays[wd] = wxDateTime::GetWeekDayName(wd, wxDateTime::Name_Abbr);
     }

+
+    for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ )
+    {
+        m_attrs[n] = NULL;
+    }
+
+    InitColours();
+}
+
+void wxCalendarCtrl::InitColours()
+{
+    m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+    m_colBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+    m_colSorrounding = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+
+    m_colHolidayFg = *wxRED;
+    // don't set m_colHolidayBg - by default, same as our bg colour
+
+    m_colHeaderFg = *wxBLUE;
+    m_colHeaderBg = *wxLIGHT_GREY;

 }
 
 }
 

-bool wxCalendarCtrl::Create(wxWindow * WXUNUSED(parent),
-                            wxWindowID WXUNUSED(id),
+bool wxCalendarCtrl::Create(wxWindow *parent,
+                            wxWindowID id,

                             const wxDateTime& date,
                             const wxDateTime& date,

-                            const wxPoint& WXUNUSED(pos),
+                            const wxPoint& pos,

                             const wxSize& size,
                             long style,
                             const wxSize& size,
                             long style,

-                            const wxString& WXUNUSED(name))
+                            const wxString& name)

 {
 {

-    SetWindowStyle(style | (wxRAISED_BORDER | wxWANTS_CHARS));
+    if ( !wxControl::Create(parent, id, pos, size,
+                            style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE,
+                            wxDefaultValidator, name) )
+    {
+        return false;
+    }
+
+    // needed to get the arrow keys normally used for the dialog navigation
+    SetWindowStyle(style | wxWANTS_CHARS);

 
     m_date = date.IsValid() ? date : wxDateTime::Today();
 
 
     m_date = date.IsValid() ? date : wxDateTime::Today();
 

-    m_comboMonth = new wxMonthComboBox(this);
-    m_spinYear = new wxYearSpinCtrl(this);
+    m_lowdate = wxDefaultDateTime;
+    m_highdate = wxDefaultDateTime;

 
 

-    wxSize sizeReal;
-    if ( size.x == -1 || size.y == -1 )
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
     {

-        sizeReal = DoGetBestSize();
-        if ( size.x != -1 )
-            sizeReal.x = size.x;
-        if ( size.y != -1 )
-            sizeReal.y = size.y;
+        CreateYearSpinCtrl();
+        m_staticYear = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%Y")),
+                                        wxDefaultPosition, wxDefaultSize,
+                                        wxALIGN_CENTRE);
+
+        CreateMonthComboBox();
+        m_staticMonth = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%B")),
+                                         wxDefaultPosition, wxDefaultSize,
+                                         wxALIGN_CENTRE);

     }
     }

-    else
+
+    ShowCurrentControls();
+
+    // 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
+    SetInitialSize(size);
+    SetPosition(pos);
+
+    // Since we don't paint the whole background make sure that the platform
+    // will use the right one.
+    SetBackgroundColour(m_colBackground);
+
+    SetHolidayAttrs();
+
+    return true;
+}
+
+wxCalendarCtrl::~wxCalendarCtrl()
+{
+    for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ )

     {
     {

-        sizeReal = size;
+        delete m_attrs[n];

     }
 
     }
 

-    SetSize(sizeReal);
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        delete m_comboMonth;
+        delete m_staticMonth;
+        delete m_spinYear;
+        delete m_staticYear;
+    }
+}

 
 

-    SetBackgroundColour(*wxWHITE);
-    SetFont(*wxSWISS_FONT);
+void wxCalendarCtrl::SetWindowStyleFlag(long style)
+{
+    // changing this style doesn't work because the controls are not
+    // created/shown/hidden accordingly
+    wxASSERT_MSG( (style & wxCAL_SEQUENTIAL_MONTH_SELECTION) ==
+                    (m_windowStyle & wxCAL_SEQUENTIAL_MONTH_SELECTION),
+                  _T("wxCAL_SEQUENTIAL_MONTH_SELECTION can't be changed after creation") );

 
 

-    return TRUE;
+    wxControl::SetWindowStyleFlag(style);

 }
 
 }
 

-wxCalendarCtrl::~wxCalendarCtrl()
+// ----------------------------------------------------------------------------
+// Create the wxComboBox and wxSpinCtrl
+// ----------------------------------------------------------------------------
+
+void wxCalendarCtrl::CreateMonthComboBox()
+{
+    m_comboMonth = new wxComboBox(GetParent(), wxID_ANY,
+                                  wxEmptyString,
+                                  wxDefaultPosition,
+                                  wxDefaultSize,
+                                  0, NULL,
+                                  wxCB_READONLY | wxCLIP_SIBLINGS);
+
+    wxDateTime::Month m;
+    for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
+    {
+        m_comboMonth->Append(wxDateTime::GetMonthName(m));
+    }
+
+    m_comboMonth->SetSelection(GetDate().GetMonth());
+    m_comboMonth->SetSize(wxDefaultCoord,
+                          wxDefaultCoord,
+                          wxDefaultCoord,
+                          wxDefaultCoord,
+                          wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
+
+    m_comboMonth->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED,
+                          wxCommandEventHandler(wxCalendarCtrl::OnMonthChange),
+                          NULL, this);
+}
+
+void wxCalendarCtrl::CreateYearSpinCtrl()

 {
 {

-#if 0
-    m_comboMonth->PopEventHandler();
-    m_spinYear->PopEventHandler();
-#endif // 0
+    m_spinYear = new wxSpinCtrl(GetParent(), wxID_ANY,
+                                GetDate().Format(_T("%Y")),
+                                wxDefaultPosition,
+                                wxDefaultSize,
+                                wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
+                                -4300, 10000, GetDate().GetYear());
+
+    m_spinYear->Connect(wxEVT_COMMAND_TEXT_UPDATED,
+                        wxCommandEventHandler(wxCalendarCtrl::OnYearTextChange),
+                        NULL, this);
+
+    m_spinYear->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED,
+                        wxCommandEventHandler(wxCalendarCtrl::OnYearChange),
+                        NULL, this);

 }
 
 // ----------------------------------------------------------------------------
 // forward wxWin functions to subcontrols
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // forward wxWin functions to subcontrols
 // ----------------------------------------------------------------------------
 

+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 = NULL;
+    m_spinYear = NULL;
+    m_comboMonth = NULL;
+    m_staticMonth = NULL;
+
+    return wxControl::Destroy();
+}
+

 bool wxCalendarCtrl::Show(bool show)
 {
     if ( !wxControl::Show(show) )
     {
 bool wxCalendarCtrl::Show(bool show)
 {
     if ( !wxControl::Show(show) )
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    m_comboMonth->Show(show);
-    m_spinYear->Show(show);
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        if ( GetMonthControl() )
+        {
+            GetMonthControl()->Show(show);
+            GetYearControl()->Show(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;

     }
 
     }
 

-    m_comboMonth->Enable(enable);
-    m_spinYear->Enable(enable);
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        GetMonthControl()->Enable(enable);
+        GetYearControl()->Enable(enable);
+    }

 
 

-    return TRUE;
+    return true;

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

-// changing date
+// enable/disable month/year controls

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxCalendarCtrl::SetDate(const wxDateTime& date)
+void wxCalendarCtrl::ShowCurrentControls()

 {
 {

-    if ( m_date.GetMonth() == date.GetMonth() &&
-         m_date.GetYear() == date.GetYear() )
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
     {

-        // just change the day
-        ChangeDay(date);
+        if ( AllowMonthChange() )
+        {
+            m_comboMonth->Show();
+            m_staticMonth->Hide();
+
+            if ( AllowYearChange() )
+            {
+                m_spinYear->Show();
+                m_staticYear->Hide();
+
+                // skip the rest
+                return;
+            }
+        }
+        else
+        {
+            m_comboMonth->Hide();
+            m_staticMonth->Show();
+        }
+
+        // year change not allowed here
+        m_spinYear->Hide();
+        m_staticYear->Show();

     }
     }

-    else
+    //else: these controls are not even created, don't show/hide them
+}
+
+wxControl *wxCalendarCtrl::GetMonthControl() const
+{
+    return AllowMonthChange() ? (wxControl *)m_comboMonth : (wxControl *)m_staticMonth;
+}
+
+wxControl *wxCalendarCtrl::GetYearControl() const
+{
+    return AllowYearChange() ? (wxControl *)m_spinYear : (wxControl *)m_staticYear;
+}
+
+void wxCalendarCtrl::EnableYearChange(bool enable)
+{
+    if ( enable != AllowYearChange() )

     {
     {

-        // change everything
-        m_date = date;
+        long style = GetWindowStyle();
+        if ( enable )
+            style &= ~wxCAL_NO_YEAR_CHANGE;
+        else
+            style |= wxCAL_NO_YEAR_CHANGE;
+        SetWindowStyle(style);
+
+        ShowCurrentControls();
+        if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION )
+        {
+            Refresh();
+        }
+    }
+}

 
 

-        // update the controls
-        m_comboMonth->SetSelection(m_date.GetMonth());
-        m_spinYear->SetValue(m_date.Format(_T("%Y")));
+void wxCalendarCtrl::EnableMonthChange(bool enable)
+{
+    if ( enable != AllowMonthChange() )
+    {
+        long style = GetWindowStyle();
+        if ( enable )
+            style &= ~wxCAL_NO_MONTH_CHANGE;
+        else
+            style |= wxCAL_NO_MONTH_CHANGE;
+        SetWindowStyle(style);
+
+        ShowCurrentControls();
+        if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION )
+        {
+            Refresh();
+        }
+    }
+}

 
 

-        // update the calendar
-        Refresh();
+// ----------------------------------------------------------------------------
+// changing date
+// ----------------------------------------------------------------------------
+
+bool wxCalendarCtrl::SetDate(const wxDateTime& date)
+{
+    bool retval = true;
+
+    bool sameMonth = m_date.GetMonth() == date.GetMonth(),
+         sameYear = m_date.GetYear() == date.GetYear();
+
+    if ( IsDateInRange(date) )
+    {
+        if ( sameMonth && sameYear )
+        {
+            // just change the day
+            ChangeDay(date);
+        }
+        else
+        {
+            if ( AllowMonthChange() && (AllowYearChange() || sameYear) )
+            {
+                // change everything
+                m_date = date;
+
+                if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+                {
+                    // update the controls
+                    m_comboMonth->SetSelection(m_date.GetMonth());
+
+                    if ( AllowYearChange() )
+                    {
+                        if ( !m_userChangedYear )
+                            m_spinYear->SetValue(m_date.Format(_T("%Y")));
+                    }
+                }
+
+                // as the month changed, holidays did too
+                SetHolidayAttrs();
+
+                // update the calendar
+                Refresh();
+            }
+            else
+            {
+                // forbidden
+                retval = false;
+            }
+        }

     }
     }

+
+    m_userChangedYear = false;
+
+    return retval;

 }
 
 void wxCalendarCtrl::ChangeDay(const wxDateTime& date)
 }
 
 void wxCalendarCtrl::ChangeDay(const wxDateTime& date)


@@ -283,9 +554,65 @@ void wxCalendarCtrl::SetDateAndNotify(const wxDateTime& date)
     else
         return;
 
     else
         return;
 

-    SetDate(date);
+    if ( SetDate(date) )
+    {
+        GenerateEvents(type, wxEVT_CALENDAR_SEL_CHANGED);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// date range
+// ----------------------------------------------------------------------------
+
+bool wxCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
+{
+    bool retval = true;
+
+    if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) )
+    {
+        m_lowdate = date;
+    }
+    else
+    {
+        retval = false;
+    }
+
+    return retval;
+}
+
+bool wxCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
+{
+    bool retval = true;
+
+    if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) )
+    {
+        m_highdate = date;
+    }
+    else
+    {
+        retval = false;
+    }

 
 

-    GenerateEvent(type);
+    return retval;
+}
+
+bool wxCalendarCtrl::SetDateRange(const wxDateTime& lowerdate /* = wxDefaultDateTime */, const wxDateTime& upperdate /* = wxDefaultDateTime */)
+{
+    bool retval = true;
+
+    if (
+        ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : true ) ) &&
+        ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : true ) ) )
+    {
+        m_lowdate = lowerdate;
+        m_highdate = upperdate;
+    }
+    else
+    {
+        retval = false;
+    }
+
+    return retval;

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


@@ -302,22 +629,121 @@ wxDateTime wxCalendarCtrl::GetStartDate() const
     date.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST
                           ? wxDateTime::Mon : wxDateTime::Sun);
 
     date.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST
                           ? wxDateTime::Mon : wxDateTime::Sun);
 

-    // be sure to do it or it might gain 1 hour if DST changed in between
-    date.ResetTime();
+    if ( GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS )
+    {
+        // We want to offset the calendar if we start on the first..
+        if ( date.GetDay() == 1 )
+        {
+            date -= wxDateSpan::Week();
+        }
+    }

 
     return date;
 }
 
 bool wxCalendarCtrl::IsDateShown(const wxDateTime& date) const
 {
 
     return date;
 }
 
 bool wxCalendarCtrl::IsDateShown(const wxDateTime& date) const
 {

-    return date.GetMonth() == m_date.GetMonth();
+    if ( !(GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS) )
+    {
+        return date.GetMonth() == m_date.GetMonth();
+    }
+    else
+    {
+        return true;
+    }
+}
+
+bool wxCalendarCtrl::IsDateInRange(const wxDateTime& date) const
+{
+    // Check if the given date is in the range specified
+    return ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true )
+        && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) );
+}
+
+bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
+{
+    bool retval = false;
+
+    if ( !(IsDateInRange(*target)) )
+    {
+        if ( target->GetYear() < m_date.GetYear() )
+        {
+            if ( target->GetYear() >= GetLowerDateLimit().GetYear() )
+            {
+                *target = GetLowerDateLimit();
+                retval = true;
+            }
+            else
+            {
+                *target = m_date;
+            }
+        }
+        else
+        {
+            if ( target->GetYear() <= GetUpperDateLimit().GetYear() )
+            {
+                *target = GetUpperDateLimit();
+                retval = true;
+            }
+            else
+            {
+                *target = m_date;
+            }
+        }
+    }
+    else
+    {
+        retval = true;
+    }
+
+    return retval;
+}
+
+bool wxCalendarCtrl::ChangeMonth(wxDateTime* target) const
+{
+    bool retval = true;
+
+    if ( !(IsDateInRange(*target)) )
+    {
+        retval = false;
+
+        if ( target->GetMonth() < m_date.GetMonth() )
+        {
+            *target = GetLowerDateLimit();
+        }
+        else
+        {
+            *target = GetUpperDateLimit();
+        }
+    }
+
+    return retval;

 }
 
 size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const
 {
 }
 
 size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const
 {

-    return date.GetWeekOfMonth(GetWindowStyle() & wxCAL_MONDAY_FIRST
-                               ? wxDateTime::Monday_First
-                               : wxDateTime::Sunday_First);
+    size_t retval = date.GetWeekOfMonth(GetWindowStyle() & wxCAL_MONDAY_FIRST
+                                   ? wxDateTime::Monday_First
+                                   : wxDateTime::Sunday_First);
+
+    if ( (GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS) )
+    {
+        // we need to offset an extra week if we "start" on the 1st of the month
+        wxDateTime::Tm tm = date.GetTm();
+
+        wxDateTime datetest = wxDateTime(1, tm.mon, tm.year);
+
+        // rewind back
+        datetest.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST
+                              ? wxDateTime::Mon : wxDateTime::Sun);
+
+        if ( datetest.GetDay() == 1 )
+        {
+            retval += 1;
+        }
+    }
+
+    return retval;

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


@@ -328,24 +754,47 @@ size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const
 // size or position changes: the combobox and spinctrl are along the top of
 // the available area and the calendar takes up therest of the space
 
 // size or position changes: the combobox and spinctrl are along the top of
 // the available area and the calendar takes up therest of the space
 

+// the static controls are supposed to be always smaller than combo/spin so we
+// always use the latter for size calculations and position the static to take
+// the same space
+

 // the constants used for the layout
 #define VERT_MARGIN     5           // distance between combo and calendar
 // 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
 #define HORZ_MARGIN    15           //                            spin

-
+#endif

 wxSize wxCalendarCtrl::DoGetBestSize() const
 {
     // calc the size of the calendar
     ((wxCalendarCtrl *)this)->RecalcGeometry(); // const_cast
 
     wxCoord width = 7*m_widthCol,
 wxSize wxCalendarCtrl::DoGetBestSize() const
 {
     // calc the size of the calendar
     ((wxCalendarCtrl *)this)->RecalcGeometry(); // const_cast
 
     wxCoord width = 7*m_widthCol,

-            height = 7*m_heightRow;
+            height = 7*m_heightRow + m_rowOffset + VERT_MARGIN;

 
 

-    wxSize sizeCombo = m_comboMonth->GetBestSize(),
-           sizeSpin = m_spinYear->GetBestSize();
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        // the combobox doesn't report its height correctly (it returns the
+        // height including the drop down list) so don't use it
+        height += m_spinYear->GetBestSize().y;

 
 

-    height += VERT_MARGIN + wxMax(sizeCombo.y, sizeSpin.y);

 
 

-    return wxSize(width, height);
+        wxCoord w2 = m_comboMonth->GetBestSize().x + HORZ_MARGIN + GetCharWidth()*6;
+        if (width < w2)
+            width = w2;
+    }
+
+    if ( !HasFlag(wxBORDER_NONE) )
+    {
+        // the border would clip the last line otherwise
+        height += 6;
+        width += 4;
+    }
+
+    wxSize best(width, height);
+    CacheBestSize(best);
+    return best;

 }
 
 void wxCalendarCtrl::DoSetSize(int x, int y,
 }
 
 void wxCalendarCtrl::DoSetSize(int x, int y,


@@ -357,14 +806,39 @@ void wxCalendarCtrl::DoSetSize(int x, int y,
 
 void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 {

-    wxSize sizeCombo = m_comboMonth->GetSize();
-    m_comboMonth->Move(x, y);
+    int yDiff;

 
 

-    int xDiff = sizeCombo.x + HORZ_MARGIN;
-    m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth )
+    {
+        wxSize sizeCombo = m_comboMonth->GetEffectiveMinSize();
+        wxSize sizeStatic = m_staticMonth->GetSize();
+        wxSize sizeSpin = m_spinYear->GetSize();
+
+        // wxMSW sometimes reports the wrong combo height,
+        // so on this platform we'll use the spin control
+        // height instead.
+#ifdef __WXMSW__
+        int maxHeight = sizeSpin.y;
+        int requiredSpinHeight = -1;
+#else
+        int maxHeight = sizeCombo.y;
+        int requiredSpinHeight = sizeCombo.y;
+#endif
+        int dy = (maxHeight - sizeStatic.y) / 2;
+        m_comboMonth->Move(x, y);
+        m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1, sizeStatic.y);

 
 

-    wxSize sizeSpin = m_spinYear->GetSize();
-    int yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
+        int xDiff = sizeCombo.x + HORZ_MARGIN;
+
+        m_spinYear->SetSize(x + xDiff, y, width - xDiff, requiredSpinHeight);
+        m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
+
+        yDiff = wxMax(sizeSpin.y, maxHeight) + VERT_MARGIN;
+    }
+    else // no controls on the top
+    {
+        yDiff = 0;
+    }

 
     wxControl::DoMoveWindow(x, y + yDiff, width, height - yDiff);
 }
 
     wxControl::DoMoveWindow(x, y + yDiff, width, height - yDiff);
 }


@@ -372,37 +846,53 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
 {
     wxControl::DoGetPosition(x, y);
 void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
 {
     wxControl::DoGetPosition(x, y);

-
-    // our real top corner is not in this position
-    if ( y )
+#ifndef __WXPM__
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && GetMonthControl() )

     {
     {

-        *y -= m_comboMonth->GetSize().y + VERT_MARGIN;
+        // our real top corner is not in this position
+        if ( y )
+        {
+            *y -= GetMonthControl()->GetSize().y + VERT_MARGIN;
+        }

     }
     }

+#endif

 }
 
 void wxCalendarCtrl::DoGetSize(int *width, int *height) const
 {
     wxControl::DoGetSize(width, height);
 }
 
 void wxCalendarCtrl::DoGetSize(int *width, int *height) const
 {
     wxControl::DoGetSize(width, height);

-
-    // our real height is bigger
-    if ( height )
+#ifndef __WXPM__
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
     {

-        *height += m_comboMonth->GetSize().y + VERT_MARGIN;
+        // our real height is bigger
+        if ( height && GetMonthControl())
+        {
+            *height += GetMonthControl()->GetSize().y + VERT_MARGIN;
+        }

     }
     }

+#endif

 }
 
 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 (weekday names are not necessarily wider
+    // than the numbers (in some languages), so let's not assume that they are)

     m_widthCol = 0;
     m_widthCol = 0;

+    for ( int day = 10; day <= 31; day++)
+    {
+        wxCoord width;
+        dc.GetTextExtent(wxString::Format(wxT("%d"), day), &width, &m_heightRow);
+        if ( width > m_widthCol )
+        {
+            // 1.5 times the width gives nice margins even if the weekday
+            // names are short
+            m_widthCol = width+width/2;
+        }
+    }

     wxDateTime::WeekDay wd;
     for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
     {
     wxDateTime::WeekDay wd;
     for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
     {


@@ -417,6 +907,8 @@ void wxCalendarCtrl::RecalcGeometry()
     // leave some margins
     m_widthCol += 2;
     m_heightRow += 2;
     // leave some margins
     m_widthCol += 2;
     m_heightRow += 2;

+
+    m_rowOffset = HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ? m_heightRow : 0; // conditional in relation to style

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


@@ -427,39 +919,112 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 

-    dc.SetFont(m_font);
+    dc.SetFont(GetFont());

 
     RecalcGeometry();
 
 #if DEBUG_PAINT
 
     RecalcGeometry();
 
 #if DEBUG_PAINT

-    printf("--- starting to paint, selection: %s, week %u\n",
+    wxLogDebug("--- starting to paint, selection: %s, week %u\n",

            m_date.Format("%a %d-%m-%Y %H:%M:%S").c_str(),
            GetWeek(m_date));
 #endif
 
            m_date.Format("%a %d-%m-%Y %H:%M:%S").c_str(),
            GetWeek(m_date));
 #endif
 

+    wxCoord y = 0;
+    wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
+
+    if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        // draw the sequential month-selector
+
+        dc.SetBackgroundMode(wxTRANSPARENT);
+        dc.SetTextForeground(*wxBLACK);
+        dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
+        dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));
+        dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);
+
+        // Get extent of month-name + year
+        wxCoord monthw, monthh;
+        wxString headertext = m_date.Format(wxT("%B %Y"));
+        dc.GetTextExtent(headertext, &monthw, &monthh);
+
+        // draw month-name centered above weekdays
+        wxCoord monthx = ((m_widthCol * 7) - monthw) / 2 + x0;
+        wxCoord monthy = ((m_heightRow - monthh) / 2) + y;
+        dc.DrawText(headertext, monthx,  monthy);
+
+        // calculate the "month-arrows"
+        wxPoint leftarrow[3];
+        wxPoint rightarrow[3];
+
+        int arrowheight = monthh / 2;
+
+        leftarrow[0] = wxPoint(0, arrowheight / 2);
+        leftarrow[1] = wxPoint(arrowheight / 2, 0);
+        leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
+
+        rightarrow[0] = wxPoint(0,0);
+        rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
+        rightarrow[2] = wxPoint(0, arrowheight - 1);
+
+        // draw the "month-arrows"
+
+        wxCoord arrowy = (m_heightRow - arrowheight) / 2;
+        wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2 + x0;
+        wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6 + x0;
+        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 ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) )
+            {
+                m_leftArrowRect = wxRect(larrowx - 3, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
+                dc.SetBrush(*wxBLACK_BRUSH);
+                dc.SetPen(*wxBLACK_PEN);
+                dc.DrawPolygon(3, leftarrow, larrowx , arrowy, wxWINDING_RULE);
+                dc.SetBrush(*wxTRANSPARENT_BRUSH);
+                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() ) )
+            {
+                m_rightArrowRect = wxRect(rarrowx - 4, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
+                dc.SetBrush(*wxBLACK_BRUSH);
+                dc.SetPen(*wxBLACK_PEN);
+                dc.DrawPolygon(3, rightarrow, rarrowx , arrowy, wxWINDING_RULE);
+                dc.SetBrush(*wxTRANSPARENT_BRUSH);
+                dc.DrawRectangle(m_rightArrowRect);
+            }
+        }
+
+        y += m_heightRow;
+    }
+

     // first draw the week days
     // first draw the week days

-    if ( IsExposed(0, 0, 7*m_widthCol, m_heightRow) )
+    if ( IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow) )

     {
 #if DEBUG_PAINT
     {
 #if DEBUG_PAINT

-        puts("painting the header");
+        wxLogDebug("painting the header");

 #endif
 
 #endif
 

-        dc.SetTextForeground(*wxBLUE);
-        dc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));

         dc.SetBackgroundMode(wxTRANSPARENT);
         dc.SetBackgroundMode(wxTRANSPARENT);

-        dc.SetPen(*wxLIGHT_GREY_PEN);
-        dc.DrawRectangle(0, 0, 7*m_widthCol, m_heightRow);
+        dc.SetTextForeground(m_colHeaderFg);
+        dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
+        dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));
+        dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);

 
         bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0;
 
         bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0;

-        for ( size_t wd = 0; wd < 7; wd++ )
+        for ( int wd = 0; wd < 7; wd++ )

         {
             size_t n;
             if ( startOnMonday )
                 n = wd == 6 ? 0 : wd + 1;
             else
                 n = wd;
         {
             size_t n;
             if ( startOnMonday )
                 n = wd == 6 ? 0 : wd + 1;
             else
                 n = wd;

-
-            dc.DrawText(m_weekdays[n], wd*m_widthCol + 1, 0);
+            wxCoord dayw, dayh;
+            dc.GetTextExtent(m_weekdays[n], &dayw, &dayh);
+            dc.DrawText(m_weekdays[n], x0 + (wd*m_widthCol) + ((m_widthCol- dayw) / 2), y); // center the day-name

         }
     }
 
         }
     }
 


@@ -467,11 +1032,11 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.SetTextForeground(*wxBLACK);
     //dc.SetFont(*wxNORMAL_FONT);
 
     dc.SetTextForeground(*wxBLACK);
     //dc.SetFont(*wxNORMAL_FONT);
 

-    wxCoord y = m_heightRow;
-
+    y += m_heightRow;

     wxDateTime date = GetStartDate();
     wxDateTime date = GetStartDate();

+

 #if DEBUG_PAINT
 #if DEBUG_PAINT

-    printf("starting calendar from %s\n",
+    wxLogDebug("starting calendar from %s\n",

             date.Format("%a %d-%m-%Y %H:%M:%S").c_str());
 #endif
 
             date.Format("%a %d-%m-%Y %H:%M:%S").c_str());
 #endif
 


@@ -479,7 +1044,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     for ( size_t nWeek = 1; nWeek <= 6; nWeek++, y += m_heightRow )
     {
         // if the update region doesn't intersect this row, don't paint it
     for ( size_t nWeek = 1; nWeek <= 6; nWeek++, y += m_heightRow )
     {
         // if the update region doesn't intersect this row, don't paint it

-        if ( !IsExposed(0, y, 7*m_widthCol, m_heightRow - 1) )
+        if ( !IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow - 1) )

         {
             date += wxDateSpan::Week();
 
         {
             date += wxDateSpan::Week();
 


@@ -487,31 +1052,125 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         }
 
 #if DEBUG_PAINT
         }
 
 #if DEBUG_PAINT

-        printf("painting week %d at y = %d\n", nWeek, y);
+        wxLogDebug("painting week %d at y = %d\n", nWeek, y);

 #endif
 
 #endif
 

-        for ( size_t wd = 0; wd < 7; wd++ )
+        for ( int wd = 0; wd < 7; wd++ )

         {
         {

+            dc.SetTextBackground(m_colBackground);

             if ( IsDateShown(date) )
             {
                 // don't use wxDate::Format() which prepends 0s
             if ( IsDateShown(date) )
             {
                 // don't use wxDate::Format() which prepends 0s

-                wxString day = wxString::Format(_T("%u"), date.GetDay());
+                unsigned int day = date.GetDay();
+                wxString dayStr = wxString::Format(_T("%u"), day);

                 wxCoord width;
                 wxCoord width;

-                dc.GetTextExtent(day, &width, (wxCoord *)NULL);
+                dc.GetTextExtent(dayStr, &width, (wxCoord *)NULL);

 
 

-                bool isSel = m_date == date;
-                if ( isSel )
+                bool changedColours = false,
+                     changedFont = false;
+
+                bool isSel = false;
+                wxCalendarDateAttr *attr = NULL;
+
+                if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) )
+                {
+                    // surrounding week or out-of-range
+                    // draw "disabled"
+                    dc.SetTextForeground(m_colSorrounding);
+                    changedColours = true;
+                }
+                else

                 {
                 {

-                    dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-                    dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT));
+                    isSel = date.IsSameDate(m_date);
+                    attr = m_attrs[day - 1];
+
+                    if ( isSel )
+                    {
+                        dc.SetTextForeground(m_colHighlightFg);
+                        dc.SetTextBackground(m_colHighlightBg);
+
+                        changedColours = true;
+                    }
+                    else if ( attr )
+                    {
+                        wxColour colFg, colBg;
+
+                        if ( attr->IsHoliday() )
+                        {
+                            colFg = m_colHolidayFg;
+                            colBg = m_colHolidayBg;
+                        }
+                        else
+                        {
+                            colFg = attr->GetTextColour();
+                            colBg = attr->GetBackgroundColour();
+                        }
+
+                        if ( colFg.Ok() )
+                        {
+                            dc.SetTextForeground(colFg);
+                            changedColours = true;
+                        }
+
+                        if ( colBg.Ok() )
+                        {
+                            dc.SetTextBackground(colBg);
+                            changedColours = true;
+                        }
+
+                        if ( attr->HasFont() )
+                        {
+                            dc.SetFont(attr->GetFont());
+                            changedFont = true;
+                        }
+                    }

                 }
 
                 }
 

-                dc.DrawText(day, wd*m_widthCol + (m_widthCol - width) / 2, y);
+                wxCoord x = wd*m_widthCol + (m_widthCol - width) / 2 + x0;
+                dc.DrawText(dayStr, x, y + 1);

 
 

-                if ( isSel )
+                if ( !isSel && attr && attr->HasBorder() )

                 {
                 {

-                    dc.SetTextForeground(m_foregroundColour);
-                    dc.SetTextBackground(m_backgroundColour);
+                    wxColour colBorder;
+                    if ( attr->HasBorderColour() )
+                    {
+                        colBorder = attr->GetBorderColour();
+                    }
+                    else
+                    {
+                        colBorder = GetForegroundColour();
+                    }
+
+                    wxPen pen(colBorder, 1, wxSOLID);
+                    dc.SetPen(pen);
+                    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+
+                    switch ( attr->GetBorder() )
+                    {
+                        case wxCAL_BORDER_SQUARE:
+                            dc.DrawRectangle(x - 2, y,
+                                             width + 4, m_heightRow);
+                            break;
+
+                        case wxCAL_BORDER_ROUND:
+                            dc.DrawEllipse(x - 2, y,
+                                           width + 4, m_heightRow);
+                            break;
+
+                        default:
+                            wxFAIL_MSG(_T("unknown border type"));
+                    }
+                }
+
+                if ( changedColours )
+                {
+                    dc.SetTextForeground(GetForegroundColour());
+                    dc.SetTextBackground(GetBackgroundColour());
+                }
+
+                if ( changedFont )
+                {
+                    dc.SetFont(GetFont());

                 }
             }
             //else: just don't draw it
                 }
             }
             //else: just don't draw it


@@ -519,8 +1178,34 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
             date += wxDateSpan::Day();
         }
     }
             date += wxDateSpan::Day();
         }
     }

+
+    // Greying out out-of-range background
+    bool showSurrounding = (GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS) != 0;
+
+    date = ( showSurrounding ) ? GetStartDate() : wxDateTime(1, m_date.GetMonth(), m_date.GetYear());
+    if ( !IsDateInRange(date) )
+    {
+        wxDateTime firstOOR = GetLowerDateLimit() - wxDateSpan::Day(); // first out-of-range
+
+        wxBrush oorbrush = *wxLIGHT_GREY_BRUSH;
+        oorbrush.SetStyle(wxFDIAGONAL_HATCH);
+
+        HighlightRange(&dc, date, firstOOR, wxTRANSPARENT_PEN, &oorbrush);
+    }
+
+    date = ( showSurrounding ) ? GetStartDate() + wxDateSpan::Weeks(6) - wxDateSpan::Day() : wxDateTime().SetToLastMonthDay(m_date.GetMonth(), m_date.GetYear());
+    if ( !IsDateInRange(date) )
+    {
+        wxDateTime firstOOR = GetUpperDateLimit() + wxDateSpan::Day(); // first out-of-range
+
+        wxBrush oorbrush = *wxLIGHT_GREY_BRUSH;
+        oorbrush.SetStyle(wxFDIAGONAL_HATCH);
+
+        HighlightRange(&dc, firstOOR, date, wxTRANSPARENT_PEN, &oorbrush);
+    }
+

 #if DEBUG_PAINT
 #if DEBUG_PAINT

-    puts("+++ finished painting");
+    wxLogDebug("+++ finished painting");

 #endif
 }
 
 #endif
 }
 


@@ -533,19 +1218,209 @@ void wxCalendarCtrl::RefreshDate(const wxDateTime& date)
     // always refresh the whole row at once because our OnPaint() will draw
     // the whole row anyhow - and this allows the small optimisation in
     // OnClick() below to work
     // always refresh the whole row at once because our OnPaint() will draw
     // the whole row anyhow - and this allows the small optimisation in
     // OnClick() below to work

-    rect.x = 0;
-    rect.y = m_heightRow * GetWeek(date);
+    rect.x = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
+
+    rect.y = (m_heightRow * GetWeek(date)) + m_rowOffset;
+

     rect.width = 7*m_widthCol;
     rect.height = m_heightRow;
 
     rect.width = 7*m_widthCol;
     rect.height = m_heightRow;
 

+#ifdef __WXMSW__
+    // VZ: for some reason, the selected date seems to occupy more space under
+    //     MSW - this is probably some bug in the font size calculations, but I
+    //     don't know where exactly. This fix is ugly and leads to more
+    //     refreshes than really needed, but without it the selected days
+    //     leaves even more ugly underscores on screen.
+    rect.Inflate(0, 1);
+#endif // MSW
+

 #if DEBUG_PAINT
 #if DEBUG_PAINT

-    printf("*** refreshing week %d at (%d, %d)-(%d, %d)\n",
+    wxLogDebug("*** refreshing week %d at (%d, %d)-(%d, %d)\n",

            GetWeek(date),
            rect.x, rect.y,
            rect.x + rect.width, rect.y + rect.height);
 #endif
 
            GetWeek(date),
            rect.x, rect.y,
            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, const wxPen* pPen, const wxBrush* pBrush)
+{
+    // Highlights the given range using pen and brush
+    // Does nothing if todate < fromdate
+
+
+#if DEBUG_PAINT
+    wxLogDebug("+++ HighlightRange: (%s) - (%s) +++", fromdate.Format("%d %m %Y"), todate.Format("%d %m %Y"));
+#endif
+
+    if ( todate >= fromdate )
+    {
+        // do stuff
+        // date-coordinates
+        int fd, fw;
+        int td, tw;
+
+        // implicit: both dates must be currently shown - checked by GetDateCoord
+        if ( GetDateCoord(fromdate, &fd, &fw) && GetDateCoord(todate, &td, &tw) )
+        {
+#if DEBUG_PAINT
+            wxLogDebug("Highlight range: (%i, %i) - (%i, %i)", fd, fw, td, tw);
+#endif
+            if ( ( (tw - fw) == 1 ) && ( td < fd ) )
+            {
+                // special case: interval 7 days or less not in same week
+                // split in two separate intervals
+                wxDateTime tfd = fromdate + wxDateSpan::Days(7-fd);
+                wxDateTime ftd = tfd + wxDateSpan::Day();
+#if DEBUG_PAINT
+                wxLogDebug("Highlight: Separate segments");
+#endif
+                // draw separately
+                HighlightRange(pDC, fromdate, tfd, pPen, pBrush);
+                HighlightRange(pDC, ftd, todate, pPen, pBrush);
+            }
+            else
+            {
+                int numpoints;
+                wxPoint corners[8]; // potentially 8 corners in polygon
+                wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
+
+                if ( fw == tw )
+                {
+                    // simple case: same week
+                    numpoints = 4;
+                    corners[0] = wxPoint(x0 + (fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset);
+                    corners[1] = wxPoint(x0 + (fd - 1) * m_widthCol, ((fw + 1 ) * m_heightRow) + m_rowOffset);
+                    corners[2] = wxPoint(x0 + td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset);
+                    corners[3] = wxPoint(x0 + td * m_widthCol, (tw * m_heightRow) + m_rowOffset);
+                }
+                else
+                {
+                    int cidx = 0;
+                    // "complex" polygon
+                    corners[cidx] = wxPoint(x0 + (fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
+
+                    if ( fd > 1 )
+                    {
+                        corners[cidx] = wxPoint(x0 + (fd - 1) * m_widthCol, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
+                        corners[cidx] = wxPoint(x0, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
+                    }
+
+                    corners[cidx] = wxPoint(x0, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
+                    corners[cidx] = wxPoint(x0 + td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
+
+                    if ( td < 7 )
+                    {
+                        corners[cidx] = wxPoint(x0 + td * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
+                        corners[cidx] = wxPoint(x0 + 7 * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
+                    }
+
+                    corners[cidx] = wxPoint(x0 + 7 * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
+
+                    numpoints = cidx;
+                }
+
+                // draw the polygon
+                pDC->SetBrush(*pBrush);
+                pDC->SetPen(*pPen);
+                pDC->DrawPolygon(numpoints, corners);
+            }
+        }
+    }
+    // else do nothing
+#if DEBUG_PAINT
+    wxLogDebug("--- HighlightRange ---");
+#endif
+}
+
+bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) const
+{
+    bool retval = true;
+
+#if DEBUG_PAINT
+    wxLogDebug("+++ GetDateCoord: (%s) +++", date.Format("%d %m %Y"));
+#endif
+
+    if ( IsDateShown(date) )
+    {
+        bool startOnMonday = ( GetWindowStyle() & wxCAL_MONDAY_FIRST ) != 0;
+
+        // Find day
+        *day = date.GetWeekDay();
+
+        if ( *day == 0 ) // sunday
+        {
+            *day = ( startOnMonday ) ? 7 : 1;
+        }
+        else
+        {
+            *day += ( startOnMonday ) ? 0 : 1;
+        }
+
+        int targetmonth = date.GetMonth() + (12 * date.GetYear());
+        int thismonth = m_date.GetMonth() + (12 * m_date.GetYear());
+
+        // Find week
+        if ( targetmonth == thismonth )
+        {
+            *week = GetWeek(date);
+        }
+        else
+        {
+            if ( targetmonth < thismonth )
+            {
+                *week = 1; // trivial
+            }
+            else // targetmonth > thismonth
+            {
+                wxDateTime ldcm;
+                int lastweek;
+                int lastday;
+
+                // get the datecoord of the last day in the month currently shown
+#if DEBUG_PAINT
+                wxLogDebug("     +++ LDOM +++");
+#endif
+                GetDateCoord(ldcm.SetToLastMonthDay(m_date.GetMonth(), m_date.GetYear()), &lastday, &lastweek);
+#if DEBUG_PAINT
+                wxLogDebug("     --- LDOM ---");
+#endif
+
+                wxTimeSpan span = date - ldcm;
+
+                int daysfromlast = span.GetDays();
+#if DEBUG_PAINT
+                wxLogDebug("daysfromlast: %i", daysfromlast);
+#endif
+                if ( daysfromlast + lastday > 7 ) // past week boundary
+                {
+                    int wholeweeks = (daysfromlast / 7);
+                    *week = wholeweeks + lastweek;
+                    if ( (daysfromlast - (7 * wholeweeks) + lastday) > 7 )
+                    {
+                        *week += 1;
+                    }
+                }
+                else
+                {
+                    *week = lastweek;
+                }
+            }
+        }
+    }
+    else
+    {
+        *day = -1;
+        *week = -1;
+        retval = false;
+    }
+
+#if DEBUG_PAINT
+    wxLogDebug("--- GetDateCoord: (%s) = (%i, %i) ---", date.Format("%d %m %Y"), *day, *week);
+#endif
+
+    return retval;

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


@@ -560,7 +1435,7 @@ void wxCalendarCtrl::OnDClick(wxMouseEvent& event)
     }
     else
     {
     }
     else
     {

-        GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED, FALSE);
+        GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED);

     }
 }
 
     }
 }
 


@@ -571,19 +1446,29 @@ void wxCalendarCtrl::OnClick(wxMouseEvent& event)
     switch ( HitTest(event.GetPosition(), &date, &wday) )
     {
         case wxCAL_HITTEST_DAY:
     switch ( HitTest(event.GetPosition(), &date, &wday) )
     {
         case wxCAL_HITTEST_DAY:

-            ChangeDay(date);
+            if ( IsDateInRange(date) )
+            {
+                ChangeDay(date);

 
 

-            GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED);
+                GenerateEvents(wxEVT_CALENDAR_DAY_CHANGED,
+                               wxEVT_CALENDAR_SEL_CHANGED);
+            }

             break;
 
         case wxCAL_HITTEST_HEADER:
             {
             break;
 
         case wxCAL_HITTEST_HEADER:
             {

-                wxCalendarEvent event(this, wxEVT_CALENDAR_WEEKDAY_CLICKED);
-                event.m_wday = wday;
-                (void)GetEventHandler()->ProcessEvent(event);
+                wxCalendarEvent eventWd(this, wxEVT_CALENDAR_WEEKDAY_CLICKED);
+                eventWd.m_wday = wday;
+                (void)GetEventHandler()->ProcessEvent(eventWd);

             }
             break;
 
             }
             break;
 

+        case wxCAL_HITTEST_DECMONTH:
+        case wxCAL_HITTEST_INCMONTH:
+        case wxCAL_HITTEST_SURROUNDING_WEEK:
+            SetDateAndNotify(date); // we probably only want to refresh the control. No notification.. (maybe as an option?)
+            break;
+

         default:
             wxFAIL_MSG(_T("unknown hittest code"));
             // fall through
         default:
             wxFAIL_MSG(_T("unknown hittest code"));
             // fall through


@@ -600,25 +1485,76 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
 {
     RecalcGeometry();
 
 {
     RecalcGeometry();
 

-    int wday = pos.x / m_widthCol;
+    // the position where the calendar really begins
+    wxCoord x0 = wxMax((GetSize().x - m_widthCol*7)/2, 0);

 
 

-    wxCoord y = pos.y;
-    if ( y < m_heightRow )
+    if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
     {

-        if ( wd )
+        // Header: month
+
+        // we need to find out if the hit is on left arrow, on month or on right arrow
+        // left arrow?
+        if ( m_leftArrowRect.Contains(pos) )

         {
         {

-            if ( GetWindowStyle() & wxCAL_MONDAY_FIRST )
+            if ( date )

             {
             {

-                wday = wday == 6 ? 0 : wday + 1;
+                if ( IsDateInRange(m_date - wxDateSpan::Month()) )
+                {
+                    *date = m_date - wxDateSpan::Month();
+                }
+                else
+                {
+                    *date = GetLowerDateLimit();
+                }

             }
 
             }
 

-            *wd = (wxDateTime::WeekDay)wday;
+            return wxCAL_HITTEST_DECMONTH;
+        }
+
+        if ( m_rightArrowRect.Contains(pos) )
+        {
+            if ( date )
+            {
+                if ( IsDateInRange(m_date + wxDateSpan::Month()) )
+                {
+                    *date = m_date + wxDateSpan::Month();
+                }
+                else
+                {
+                    *date = GetUpperDateLimit();
+                }
+            }
+
+            return wxCAL_HITTEST_INCMONTH;

         }
 
         }
 

-        return wxCAL_HITTEST_HEADER;

     }
 
     }
 

-    int week = (y - m_heightRow) / m_heightRow;
+    // header: week days
+    int wday = (pos.x - x0) / m_widthCol;
+    if ( pos.y < (m_heightRow + m_rowOffset) )
+    {
+        if ( pos.y > m_rowOffset )
+        {
+            if ( wd )
+            {
+                if ( GetWindowStyle() & wxCAL_MONDAY_FIRST )
+                {
+                    wday = wday == 6 ? 0 : wday + 1;
+                }
+
+                *wd = (wxDateTime::WeekDay)wday;
+            }
+
+            return wxCAL_HITTEST_HEADER;
+        }
+        else
+        {
+            return wxCAL_HITTEST_NOWHERE;
+        }
+    }
+
+    int week = (pos.y - (m_heightRow + m_rowOffset)) / m_heightRow;

     if ( week >= 6 || wday >= 7 )
     {
         return wxCAL_HITTEST_NOWHERE;
     if ( week >= 6 || wday >= 7 )
     {
         return wxCAL_HITTEST_NOWHERE;


@@ -631,7 +1567,15 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
         if ( date )
             *date = dt;
 
         if ( date )
             *date = dt;
 

-        return wxCAL_HITTEST_DAY;
+        if ( dt.GetMonth() == m_date.GetMonth() )
+        {
+
+            return wxCAL_HITTEST_DAY;
+        }
+        else
+        {
+            return wxCAL_HITTEST_SURROUNDING_WEEK;
+        }

     }
     else
     {
     }
     else
     {


@@ -653,24 +1597,60 @@ void wxCalendarCtrl::OnMonthChange(wxCommandEvent& event)
         tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year);
     }
 
         tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year);
     }
 

-    SetDate(wxDateTime(tm.mday, mon, tm.year));
+    wxDateTime target = wxDateTime(tm.mday, mon, tm.year);

 
 

-    GenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED);
+    ChangeMonth(&target);
+    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;
+    }
+

     wxDateTime::Tm tm = m_date.GetTm();
 
     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);
     }
 
     if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) )
     {
         tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
     }
 

-    SetDate(wxDateTime(tm.mday, tm.mon, year));
+    wxDateTime target = wxDateTime(tm.mday, tm.mon, year);

 
 

-    GenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED);
+    if ( ChangeYear(&target) )
+    {
+        SetDateAndNotify(target);
+    }
+    else
+    {
+        // In this case we don't want to change the date. That would put us
+        // inside the same year but a strange number of months forward/back..
+        m_spinYear->SetValue(target.GetYear());
+    }
+}
+
+void wxCalendarCtrl::OnYearTextChange(wxCommandEvent& event)
+{
+    SetUserChangedYear();
+    OnYearChange(event);
+}
+
+// Responds to colour changes, and passes event on to children.
+void wxCalendarCtrl::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    // reinit colours
+    InitColours();
+
+    // Propagate the event to the children
+    wxControl::OnSysColourChanged(event);
+
+    // Redraw control area
+    SetBackgroundColour(m_colBackground);
+    Refresh();

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


@@ -679,40 +1659,67 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
 
 void wxCalendarCtrl::OnChar(wxKeyEvent& event)
 {
 
 void wxCalendarCtrl::OnChar(wxKeyEvent& event)
 {

-    switch ( event.KeyCode() )
+    wxDateTime target;
+    switch ( event.GetKeyCode() )

     {
         case _T('+'):
         case WXK_ADD:
     {
         case _T('+'):
         case WXK_ADD:

-            SetDateAndNotify(m_date + wxDateSpan::Year());
+            target = m_date + wxDateSpan::Year();
+            if ( ChangeYear(&target) )
+            {
+                SetDateAndNotify(target);
+            }

             break;
 
         case _T('-'):
         case WXK_SUBTRACT:
             break;
 
         case _T('-'):
         case WXK_SUBTRACT:

-            SetDateAndNotify(m_date - wxDateSpan::Year());
+            target = m_date - wxDateSpan::Year();
+            if ( ChangeYear(&target) )
+            {
+                SetDateAndNotify(target);
+            }

             break;
 
             break;
 

-        case WXK_PRIOR:
-            SetDateAndNotify(m_date - wxDateSpan::Month());
+        case WXK_PAGEUP:
+            target = m_date - wxDateSpan::Month();
+            ChangeMonth(&target);
+            SetDateAndNotify(target); // always

             break;
 
             break;
 

-        case WXK_NEXT:
-            SetDateAndNotify(m_date + wxDateSpan::Month());
+        case WXK_PAGEDOWN:
+            target = m_date + wxDateSpan::Month();
+            ChangeMonth(&target);
+            SetDateAndNotify(target); // always

             break;
 
         case WXK_RIGHT:
             if ( event.ControlDown() )
             break;
 
         case WXK_RIGHT:
             if ( event.ControlDown() )

-                SetDateAndNotify(wxDateTime(m_date).SetToNextWeekDay(
+            {
+                target = wxDateTime(m_date).SetToNextWeekDay(

                                  GetWindowStyle() & wxCAL_MONDAY_FIRST
                                  GetWindowStyle() & wxCAL_MONDAY_FIRST

-                                 ? wxDateTime::Sun : wxDateTime::Sat));
+                                 ? wxDateTime::Sun : wxDateTime::Sat);
+                if ( !IsDateInRange(target) )
+                {
+                    target = GetUpperDateLimit();
+                }
+                SetDateAndNotify(target);
+            }

             else
                 SetDateAndNotify(m_date + wxDateSpan::Day());
             break;
 
         case WXK_LEFT:
             if ( event.ControlDown() )
             else
                 SetDateAndNotify(m_date + wxDateSpan::Day());
             break;
 
         case WXK_LEFT:
             if ( event.ControlDown() )

-                SetDateAndNotify(wxDateTime(m_date).SetToPrevWeekDay(
+            {
+                target = wxDateTime(m_date).SetToPrevWeekDay(

                                  GetWindowStyle() & wxCAL_MONDAY_FIRST
                                  GetWindowStyle() & wxCAL_MONDAY_FIRST

-                                 ? wxDateTime::Mon : wxDateTime::Sun));
+                                 ? wxDateTime::Mon : wxDateTime::Sun);
+                if ( !IsDateInRange(target) )
+                {
+                    target = GetLowerDateLimit();
+                }
+                SetDateAndNotify(target);
+            }

             else
                 SetDateAndNotify(m_date - wxDateSpan::Day());
             break;
             else
                 SetDateAndNotify(m_date - wxDateSpan::Day());
             break;


@@ -736,37 +1743,92 @@ void wxCalendarCtrl::OnChar(wxKeyEvent& event)
             SetDateAndNotify(wxDateTime(m_date).SetToLastMonthDay());
             break;
 
             SetDateAndNotify(wxDateTime(m_date).SetToLastMonthDay());
             break;
 

+        case WXK_RETURN:
+            GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED);
+            break;
+

         default:
             event.Skip();
     }
 }
 
 // ----------------------------------------------------------------------------
         default:
             event.Skip();
     }
 }
 
 // ----------------------------------------------------------------------------

-// wxCalendarEvent
+// holidays handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxCalendarCtrl::GenerateEvent(wxEventType type, bool selChanged)
+void wxCalendarCtrl::EnableHolidayDisplay(bool display)

 {
 {

-    // we're called for a change in some particular date field but we always
-    // also generate a generic "changed" event
-    wxCalendarEvent event(this, type);
-    (void)GetEventHandler()->ProcessEvent(event);
+    long style = GetWindowStyle();
+    if ( display )
+        style |= wxCAL_SHOW_HOLIDAYS;
+    else
+        style &= ~wxCAL_SHOW_HOLIDAYS;
+
+    SetWindowStyle(style);

 
 

-    if ( selChanged )
+    if ( display )
+        SetHolidayAttrs();
+    else
+        ResetHolidayAttrs();
+
+    Refresh();
+}
+
+void wxCalendarCtrl::SetHolidayAttrs()
+{
+    if ( GetWindowStyle() & wxCAL_SHOW_HOLIDAYS )

     {
     {

-        wxCalendarEvent event2(this, wxEVT_CALENDAR_SEL_CHANGED);
+        ResetHolidayAttrs();
+
+        wxDateTime::Tm tm = m_date.GetTm();
+        wxDateTime dtStart(1, tm.mon, tm.year),
+                   dtEnd = dtStart.GetLastMonthDay();

 
 

-        (void)GetEventHandler()->ProcessEvent(event2);
+        wxDateTimeArray hol;
+        wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol);
+
+        size_t count = hol.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            SetHoliday(hol[n].GetDay());
+        }

     }
 }
 
     }
 }
 

-void wxCalendarEvent::Init()
+void wxCalendarCtrl::SetHoliday(size_t day)

 {
 {

-    m_wday = wxDateTime::Inv_WeekDay;
+    wxCHECK_RET( day > 0 && day < 32, _T("invalid day in SetHoliday") );
+
+    wxCalendarDateAttr *attr = GetAttr(day);
+    if ( !attr )
+    {
+        attr = new wxCalendarDateAttr;
+    }
+
+    attr->SetHoliday(true);
+
+    // can't use SetAttr() because it would delete this pointer
+    m_attrs[day - 1] = attr;

 }
 
 }
 

-wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type)
-               : wxCommandEvent(type, cal->GetId())
+void wxCalendarCtrl::ResetHolidayAttrs()

 {
 {

-    m_date = cal->GetDate();
+    for ( size_t day = 0; day < 31; day++ )
+    {
+        if ( m_attrs[day] )
+        {
+            m_attrs[day]->SetHoliday(false);
+        }
+    }

 }
 }

+
+
+//static
+wxVisualAttributes
+wxCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+    // Use the same color scheme as wxListBox
+    return wxListBox::GetClassDefaultAttributes(variant);
+}
+
+#endif // wxUSE_CALENDARCTRL