patch from Søren Erland Vestø for additional wxCalendarCtrl styles (also moved them...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index c488a416f6b4403dcfd7456eee542c38ed942646..e91020cca49ec948286196fb6fd2855a57c87de3 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -43,6 +43,7 @@ All (GUI):
 - polygon support in wxRegion (Klaas Holwerda)
 - wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added
 - fixed bug with using wxExecute() to capture huge amounts of output
 - polygon support in wxRegion (Klaas Holwerda)
 - wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added
 - fixed bug with using wxExecute() to capture huge amounts of output

+- new wxCalendarCtrl styles added (Søren Erland Vestø)

 - wxDirSelector() added (Paul A. Thiessen)
 
 wxHTML:
 - wxDirSelector() added (Paul A. Thiessen)
 
 wxHTML:

diff --git a/docs/latex/wx/calctrl.tex b/docs/latex/wx/calctrl.tex
index 1b3f01f6af81ea9fa17970caba621275987b6eb4..c0041ca7d8d75ac326bd73e2ed3e2504457d80fe 100644 (file)
--- a/docs/latex/wx/calctrl.tex
+++ b/docs/latex/wx/calctrl.tex
@@ -56,6 +56,8 @@ is changed, so you will often want to update them in
 \twocolitem{\windowstyle{wxCAL\_SHOW\_HOLIDAYS}}{Highlight holidays in the calendar}
 \twocolitem{\windowstyle{wxCAL\_NO\_YEAR\_CHANGE}}{Disable the year changing}
 \twocolitem{\windowstyle{wxCAL\_NO\_MONTH\_CHANGE}}{Disable the month (and, implicitly, the year) changing}
 \twocolitem{\windowstyle{wxCAL\_SHOW\_HOLIDAYS}}{Highlight holidays in the calendar}
 \twocolitem{\windowstyle{wxCAL\_NO\_YEAR\_CHANGE}}{Disable the year changing}
 \twocolitem{\windowstyle{wxCAL\_NO\_MONTH\_CHANGE}}{Disable the month (and, implicitly, the year) changing}

+\twocolitem{\windowstyle{wxCAL\_SHOW\_SURROUNDING\_WEEKS}}{Show the neighbouring weeks in the previous and next months}
+\twocolitem{\windowstyle{wxCAL\_SEQUENTIAL\_MONTH\_SELECTION}}{Use alternative, more compact, style for the month and year selection controls.}

 \end{twocollist}
 
 The default calendar style is {\tt wxCAL\_SHOW\_HOLIDAYS}.
 \end{twocollist}
 
 The default calendar style is {\tt wxCAL\_SHOW\_HOLIDAYS}.

diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h
index a26bc143285572811f0dcd36e7d502470286abdc..dc0d4997f77e35c97ad148712c17359caa7a7c51 100644 (file)
--- a/include/wx/calctrl.h
+++ b/include/wx/calctrl.h
@@ -25,6 +25,35 @@
 
 #include "wx/datetime.h"
 
 
 #include "wx/datetime.h"
 

+// ----------------------------------------------------------------------------
+// wxCalendarCtrl flags
+// ----------------------------------------------------------------------------
+
+enum
+{
+    // show Sunday as the first day of the week (default)
+    wxCAL_SUNDAY_FIRST               = 0x0000,
+
+    // show Monder as the first day of the week
+    wxCAL_MONDAY_FIRST               = 0x0001,
+
+    // highlight holidays
+    wxCAL_SHOW_HOLIDAYS              = 0x0002,
+
+    // disable the year change control, show only the month change one
+    wxCAL_NO_YEAR_CHANGE             = 0x0004,
+
+    // don't allow changing neither month nor year (implies
+    // wxCAL_NO_YEAR_CHANGE)
+    wxCAL_NO_MONTH_CHANGE            = 0x000c,
+
+    // use MS-style month-selection instead of combo-spin combination
+    wxCAL_SEQUENTIAL_MONTH_SELECTION = 0x0010,
+
+    // show the neighbouring weeks in the previous and next month
+    wxCAL_SHOW_SURROUNDING_WEEKS     = 0x0020
+};
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -34,7 +63,10 @@ enum wxCalendarHitTestResult
 {
     wxCAL_HITTEST_NOWHERE,      // outside of anything
     wxCAL_HITTEST_HEADER,       // on the header (weekdays)
 {
     wxCAL_HITTEST_NOWHERE,      // outside of anything
     wxCAL_HITTEST_HEADER,       // on the header (weekdays)

-    wxCAL_HITTEST_DAY           // on a day in the calendar
+    wxCAL_HITTEST_DAY,          // on a day in the calendar
+    wxCAL_HITTEST_INCMONTH,
+    wxCAL_HITTEST_DECMONTH,
+    wxCAL_HITTEST_SURROUNDING_WEEK

 };
 
 // border types for a date
 };
 
 // border types for a date

diff --git a/include/wx/defs.h b/include/wx/defs.h
index a2749f74b0896d38e8e9176c251f9435e1caa8c5..c345db56a5c45a8953cc8d63c78cecf6d4c21044 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1047,15 +1047,6 @@ enum wxBorder
 #define wxHW_SCROLLBAR_NEVER    0x0002
 #define wxHW_SCROLLBAR_AUTO     0x0004
 
 #define wxHW_SCROLLBAR_NEVER    0x0002
 #define wxHW_SCROLLBAR_AUTO     0x0004
 

-/*
- * wxCalendarCtrl flags
- */
-#define wxCAL_SUNDAY_FIRST      0x0000
-#define wxCAL_MONDAY_FIRST      0x0001
-#define wxCAL_SHOW_HOLIDAYS     0x0002
-#define wxCAL_NO_YEAR_CHANGE    0x0004
-#define wxCAL_NO_MONTH_CHANGE   0x000c // no month change => no year change
-

 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these
 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these

diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h
index 076fff2d7b4578c858eb1b4dec86ed88a814c29e..1a7ca729ec4905e5c11616cd32ea955acd60fb73 100644 (file)
--- a/include/wx/generic/calctrl.h
+++ b/include/wx/generic/calctrl.h
@@ -63,9 +63,19 @@ public:
     // set/get the current date
     // ------------------------
 
     // set/get the current date
     // ------------------------
 

-    void SetDate(const wxDateTime& date);
+    bool SetDate(const wxDateTime& date); // we need to be able to control if the event should be sent in SetDateAndNotify(...)

     const wxDateTime& GetDate() const { return m_date; }
 
     const wxDateTime& GetDate() const { return m_date; }
 

+    // set/get the range in which selection can occur
+    // ---------------------------------------------
+
+    bool SetLowerDateLimit(const wxDateTime& date = wxDefaultDateTime);
+    const wxDateTime& GetLowerDateLimit() const { return m_lowdate; }
+    bool SetUpperDateLimit(const wxDateTime& date = wxDefaultDateTime);
+    const wxDateTime& GetUpperDateLimit() const { return m_highdate; }
+
+    bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, const wxDateTime& upperdate = wxDefaultDateTime);
+    

     // calendar mode
     // -------------
 
     // calendar mode
     // -------------
 


@@ -189,6 +199,13 @@ private:
     // is this date shown?
     bool IsDateShown(const wxDateTime& date) const;
 
     // is this date shown?
     bool IsDateShown(const wxDateTime& date) const;
 

+    // is this date in the given range?
+    bool IsDateInRange(const wxDateTime& date) const;
+    
+    // range helpers
+    bool ChangeYear(wxDateTime* target) const;
+    bool ChangeMonth(wxDateTime* target) const;
+

     // redraw the given date
     void RefreshDate(const wxDateTime& date);
 
     // redraw the given date
     void RefreshDate(const wxDateTime& date);
 


@@ -232,6 +249,16 @@ private:
     wxControl *GetMonthControl() const;
     wxControl *GetYearControl() const;
 
     wxControl *GetMonthControl() const;
     wxControl *GetYearControl() const;
 

+    // OnPaint helper-methods
+    
+    // Highlight the [fromdate : todate] range using pen and brush
+    void HighlightRange(wxPaintDC* dc, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pen, wxBrush* brush);
+    
+    // Get the "coordinates" for the date relative to the month currently displayed.
+    // using (day, week): upper left coord is (1, 1), lower right coord is (7, 6)
+    // if the date isn't visible (-1, -1) is put in (day, week) and false is returned
+    bool GetDateCoord(const wxDateTime& date, int *day, int *week) const;
+

     // the subcontrols
     wxStaticText *m_staticMonth;
     wxComboBox *m_comboMonth;
     // the subcontrols
     wxStaticText *m_staticMonth;
     wxComboBox *m_comboMonth;


@@ -242,6 +269,10 @@ private:
     // the current selection
     wxDateTime m_date;
 
     // the current selection
     wxDateTime m_date;
 

+    // the date-range
+    wxDateTime m_lowdate;
+    wxDateTime m_highdate;
+

     // default attributes
     wxColour m_colHighlightFg,
              m_colHighlightBg,
     // default attributes
     wxColour m_colHighlightFg,
              m_colHighlightBg,


@@ -255,7 +286,11 @@ private:
 
     // the width and height of one column/row in the calendar
     wxCoord m_widthCol,
 
     // the width and height of one column/row in the calendar
     wxCoord m_widthCol,

-            m_heightRow;
+            m_heightRow,
+            m_rowOffset;
+
+    wxRect m_leftArrowRect,
+            m_rightArrowRect;

 
     // the week day names
     wxString m_weekdays[7];
 
     // the week day names
     wxString m_weekdays[7];

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 6996c10e6bf5c523fe89562fef416dd1c8e2c327..b16e1b0c906ba866d34d2f9b718bd26b4ac16fb9 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -72,7 +72,9 @@ public:
 
     wxCalendarCtrl *GetCal() const { return m_calendar; }
 
 
     wxCalendarCtrl *GetCal() const { return m_calendar; }
 

-    void StartWithMonday(bool on);
+    // turn on/off the specified style bit on the calendar control
+    void ToggleCalStyle(bool on, int style);
+

     void HighlightSpecial(bool on);
 
 private:
     void HighlightSpecial(bool on);
 
 private:


@@ -100,6 +102,9 @@ public:
     void OnCalAllowMonth(wxCommandEvent& event);
     void OnCalAllowYear(wxCommandEvent& event);
 
     void OnCalAllowMonth(wxCommandEvent& event);
     void OnCalAllowYear(wxCommandEvent& event);
 

+    void OnCalSeqMonth(wxCommandEvent& event);
+    void OnCalShowSurroundingWeeks(wxCommandEvent& event);
+

     void OnAllowYearUpdate(wxUpdateUIEvent& event);
 
 private:
     void OnAllowYearUpdate(wxUpdateUIEvent& event);
 
 private:


@@ -124,6 +129,8 @@ enum
     Calendar_Cal_Special,
     Calendar_Cal_Month,
     Calendar_Cal_Year,
     Calendar_Cal_Special,
     Calendar_Cal_Month,
     Calendar_Cal_Year,

+    Calendar_Cal_SeqMonth,
+    Calendar_Cal_SurroundWeeks,

     Calendar_CalCtrl = 1000,
 };
 
     Calendar_CalCtrl = 1000,
 };
 


@@ -145,6 +152,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth)
     EVT_MENU(Calendar_Cal_Year, MyFrame::OnCalAllowYear)
 
     EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth)
     EVT_MENU(Calendar_Cal_Year, MyFrame::OnCalAllowYear)
 

+    EVT_MENU(Calendar_Cal_SeqMonth, MyFrame::OnCalSeqMonth)
+    EVT_MENU(Calendar_Cal_SurroundWeeks, MyFrame::OnCalShowSurroundingWeeks)
+

     EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)
 END_EVENT_TABLE()
 
     EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)
 END_EVENT_TABLE()
 


@@ -212,7 +222,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
                     "Test custom highlighting",
                     TRUE);
     menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
                     "Test custom highlighting",
                     TRUE);

+    menuCal->Append(Calendar_Cal_SurroundWeeks,
+                    "Show s&urrounding weeks\tCtrl-W",
+                    "Show the neighbouring weeks in the prev/next month",
+                    TRUE);

     menuCal->AppendSeparator();
     menuCal->AppendSeparator();

+    menuCal->Append(Calendar_Cal_SeqMonth,
+                    "To&ggle month selector style\tCtrl-G",
+                    "Use another style for the calendar controls",
+                    TRUE);

     menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M",
                     "Allow changing the month in the calendar",
                     TRUE);
     menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M",
                     "Allow changing the month in the calendar",
                     TRUE);


@@ -256,12 +274,15 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {

-    m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetId()));
+    bool enable = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->ToggleCalStyle(enable, wxCAL_MONDAY_FIRST);

 }
 
 void MyFrame::OnCalHolidays(wxCommandEvent& event)
 {
     bool enable = GetMenuBar()->IsChecked(event.GetId());
 }
 
 void MyFrame::OnCalHolidays(wxCommandEvent& event)
 {
     bool enable = GetMenuBar()->IsChecked(event.GetId());

+

     m_panel->GetCal()->EnableHolidayDisplay(enable);
 }
 
     m_panel->GetCal()->EnableHolidayDisplay(enable);
 }
 


@@ -284,6 +305,20 @@ void MyFrame::OnCalAllowYear(wxCommandEvent& event)
     m_panel->GetCal()->EnableYearChange(allow);
 }
 
     m_panel->GetCal()->EnableYearChange(allow);
 }
 

+void MyFrame::OnCalSeqMonth(wxCommandEvent& event)
+{
+    bool allow = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->ToggleCalStyle(allow, wxCAL_SEQUENTIAL_MONTH_SELECTION);
+}
+
+void MyFrame::OnCalShowSurroundingWeeks(wxCommandEvent& event)
+{
+    bool allow = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->ToggleCalStyle(allow, wxCAL_SHOW_SURROUNDING_WEEKS);
+}
+

 void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
 {
     event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month));
 void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
 {
     event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month));


@@ -357,13 +392,13 @@ void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event)
                  wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
 }
 
                  wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
 }
 

-void MyPanel::StartWithMonday(bool on)
+void MyPanel::ToggleCalStyle(bool on, int flag)

 {
     long style = m_calendar->GetWindowStyle();
     if ( on )
 {
     long style = m_calendar->GetWindowStyle();
     if ( on )

-        style |= wxCAL_MONDAY_FIRST;
+        style |= flag;

     else
     else

-        style &= ~wxCAL_MONDAY_FIRST;
+        style &= ~flag;

 
     m_calendar->SetWindowStyle(style);
 
 
     m_calendar->SetWindowStyle(style);
 

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 40e2dd3bc3206a0ac4454909c80d6d3fc1c1f8b1..ef305edb4ca54dd2813334acc3e20cee36cdf2b7 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -199,15 +199,21 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
 
     m_date = date.IsValid() ? date : wxDateTime::Today();
 
 
     m_date = date.IsValid() ? date : wxDateTime::Today();
 

-    m_spinYear = new wxYearSpinCtrl(this);
-    m_staticYear = new wxStaticText(GetParent(), -1, m_date.Format(_T("%Y")),
-                                    wxDefaultPosition, wxDefaultSize,
-                                    wxALIGN_CENTRE);
+    m_lowdate = wxDefaultDateTime;
+    m_highdate = wxDefaultDateTime;

 
 

-    m_comboMonth = new wxMonthComboBox(this);
-    m_staticMonth = new wxStaticText(GetParent(), -1, m_date.Format(_T("%B")),
-                                     wxDefaultPosition, wxDefaultSize,
-                                     wxALIGN_CENTRE);
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        m_spinYear = new wxYearSpinCtrl(this);
+        m_staticYear = new wxStaticText(GetParent(), -1, m_date.Format(_T("%Y")),
+                                        wxDefaultPosition, wxDefaultSize,
+                                        wxALIGN_CENTRE);
+
+        m_comboMonth = new wxMonthComboBox(this);
+        m_staticMonth = new wxStaticText(GetParent(), -1, m_date.Format(_T("%B")),
+                                         wxDefaultPosition, wxDefaultSize,
+                                         wxALIGN_CENTRE);
+    }

 
     ShowCurrentControls();
 
 
     ShowCurrentControls();
 


@@ -254,8 +260,14 @@ bool wxCalendarCtrl::Show(bool show)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    GetMonthControl()->Show(show);
-    GetYearControl()->Show(show);
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        if ( GetMonthControl() )
+        {
+            GetMonthControl()->Show(show);
+            GetYearControl()->Show(show);
+        }
+    }

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -267,8 +279,11 @@ bool wxCalendarCtrl::Enable(bool enable)
         return FALSE;
     }
 
         return FALSE;
     }
 

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

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -279,29 +294,32 @@ bool wxCalendarCtrl::Enable(bool enable)
 
 void wxCalendarCtrl::ShowCurrentControls()
 {
 
 void wxCalendarCtrl::ShowCurrentControls()
 {

-    if ( AllowMonthChange() )
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
     {

-        m_comboMonth->Show();
-        m_staticMonth->Hide();
-
-        if ( AllowYearChange() )
+        if ( AllowMonthChange() )

         {
         {

-            m_spinYear->Show();
-            m_staticYear->Hide();
+            m_comboMonth->Show();
+            m_staticMonth->Hide();
+
+            if ( AllowYearChange() )
+            {
+                m_spinYear->Show();
+                m_staticYear->Hide();

 
 

-            // skip the rest
-            return;
+                // skip the rest
+                return;
+            }
+        }
+        else
+        {
+            m_comboMonth->Hide();
+            m_staticMonth->Show();

         }
         }

-    }
-    else
-    {
-        m_comboMonth->Hide();
-        m_staticMonth->Show();
-    }

 
 

-    // year change not allowed here
-    m_spinYear->Hide();
-    m_staticYear->Show();
+        // year change not allowed here
+        m_spinYear->Hide();
+        m_staticYear->Show();
+    }

 }
 
 wxControl *wxCalendarCtrl::GetMonthControl() const
 }
 
 wxControl *wxCalendarCtrl::GetMonthControl() const


@@ -326,6 +344,10 @@ void wxCalendarCtrl::EnableYearChange(bool enable)
         SetWindowStyle(style);
 
         ShowCurrentControls();
         SetWindowStyle(style);
 
         ShowCurrentControls();

+        if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION )
+        {
+            Refresh();
+        }

     }
 }
 
     }
 }
 


@@ -339,8 +361,12 @@ void wxCalendarCtrl::EnableMonthChange(bool enable)
         else
             style |= wxCAL_NO_MONTH_CHANGE;
         SetWindowStyle(style);
         else
             style |= wxCAL_NO_MONTH_CHANGE;
         SetWindowStyle(style);

-
+        

         ShowCurrentControls();
         ShowCurrentControls();

+        if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION )
+        {
+            Refresh();
+        }

     }
 }
 
     }
 }
 


@@ -348,41 +374,53 @@ void wxCalendarCtrl::EnableMonthChange(bool enable)
 // changing date
 // ----------------------------------------------------------------------------
 
 // changing date
 // ----------------------------------------------------------------------------
 

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

 {
 {

+    bool retval = false;
+

     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();
 

-    if ( sameMonth && sameYear )
+    if ( IsDateInRange(date) )

     {
     {

-        // just change the day
-        ChangeDay(date);
-    }
-    else
-    {
-        if ( !AllowMonthChange() || (!AllowYearChange() && !sameYear) )
+        if ( sameMonth && sameYear )

         {
         {

-            // forbidden
-            return;
+            // just change the day
+            retval = true;
+            ChangeDay(date);

         }
         }

+        else
+        {
+            if ( !AllowMonthChange() || (!AllowYearChange() && !sameYear) )
+            {
+                // forbidden
+                return retval;
+            }

 
 

-        // change everything
-        m_date = date;
+            // change everything
+            retval = true;
+            m_date = date;

 
 

-        // update the controls
-        m_comboMonth->SetSelection(m_date.GetMonth());
+            if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+            {
+                // update the controls
+                m_comboMonth->SetSelection(m_date.GetMonth());

 
 

-        if ( AllowYearChange() )
-        {
-            m_spinYear->SetValue(m_date.Format(_T("%Y")));
-        }
+                if ( AllowYearChange() )
+                {
+                    m_spinYear->SetValue(m_date.Format(_T("%Y")));
+                }
+            }

 
 

-        // as the month changed, holidays did too
-        SetHolidayAttrs();
+            // as the month changed, holidays did too
+            SetHolidayAttrs();

 
 

-        // update the calendar
-        Refresh();
+            // update the calendar
+            Refresh();
+        }

     }
     }

+
+    return retval;

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


@@ -419,9 +457,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;
+    }

 
 

-    GenerateEvents(type, wxEVT_CALENDAR_SEL_CHANGED);
+    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;
+    }
+
+    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;

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


@@ -438,19 +532,123 @@ wxDateTime wxCalendarCtrl::GetStartDate() const
     date.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST
                           ? wxDateTime::Mon : wxDateTime::Sun);
 
     date.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST
                           ? wxDateTime::Mon : wxDateTime::Sun);
 

+    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
+{
+    bool retval = true;
+    // 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;
+}
+
+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;

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


@@ -475,16 +673,26 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
     ((wxCalendarCtrl *)this)->RecalcGeometry(); // const_cast
 
     wxCoord width = 7*m_widthCol,
     ((wxCalendarCtrl *)this)->RecalcGeometry(); // const_cast
 
     wxCoord width = 7*m_widthCol,

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

 
     // the combobox doesn't report its height correctly (it returns the
     // height including the drop down list) so don't use it
 
     // the combobox doesn't report its height correctly (it returns the
     // height including the drop down list) so don't use it

-    height += VERT_MARGIN + m_spinYear->GetBestSize().y;

 
 

-    if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) )
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        height += VERT_MARGIN + m_spinYear->GetBestSize().y;
+    }
+    else
+    {
+        height += VERT_MARGIN;
+    }
+
+//    if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) ) // This doesn't work. Default is wxBORDER_DEFAULT (0)
+    if ( !(GetWindowStyle() & wxBORDER_NONE) )

     {
         // the border would clip the last line otherwise
         height += 6;
     {
         // the border would clip the last line otherwise
         height += 6;

+        width += 4;

     }
 
     return wxSize(width, height);
     }
 
     return wxSize(width, height);


@@ -499,19 +707,27 @@ 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();
-    wxSize sizeStatic = m_staticMonth->GetSize();
-
-    int dy = (sizeCombo.y - sizeStatic.y) / 2;
-    m_comboMonth->Move(x, y);
-    m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
+    int xDiff = 0;
+    int yDiff = 0;

 
 

-    int xDiff = sizeCombo.x + HORZ_MARGIN;
-    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();
-    int yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        wxSize sizeCombo = m_comboMonth->GetSize();
+        wxSize sizeStatic = m_staticMonth->GetSize();
+
+        int dy = (sizeCombo.y - sizeStatic.y) / 2;
+        
+        m_comboMonth->Move(x, y);
+        m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
+        
+        xDiff = sizeCombo.x + HORZ_MARGIN;
+        
+        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();
+        yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
+    }

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


@@ -520,10 +736,13 @@ void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
 {
     wxControl::DoGetPosition(x, y);
 
 {
     wxControl::DoGetPosition(x, y);
 

-    // our real top corner is not in this position
-    if ( y )
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
     {

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

     }
 }
 
     }
 }
 


@@ -531,10 +750,13 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const
 {
     wxControl::DoGetSize(width, height);
 
 {
     wxControl::DoGetSize(width, height);
 

-    // our real height is bigger
-    if ( height )
+    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
     {

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

     }
 }
 
     }
 }
 


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

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

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


@@ -584,8 +808,84 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
            GetWeek(m_date));
 #endif
 
            GetWeek(m_date));
 #endif
 

+    wxCoord y = 0;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+    if ( (GetWindowStyle() & 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, 7*m_widthCol, m_heightRow);
+
+        // Get extent of month-name + year
+        wxCoord monthw, monthh;
+        wxString headertext = m_date.Format("%B %Y");
+        dc.GetTextExtent(headertext, &monthw, &monthh);
+
+        // draw month-name centered above weekdays
+        wxCoord monthx = ((m_widthCol * 7) - monthw) / 2;
+        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;
+        wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;
+        m_leftArrowRect = wxRect(0, 0, 0, 0);
+        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(wxBrush(*wxBLACK, wxSOLID));
+                dc.SetPen(wxPen(*wxBLACK, 1, wxSOLID));
+                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(wxBrush(*wxBLACK, wxSOLID));
+                dc.SetPen(wxPen(*wxBLACK, 1, wxSOLID));
+                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(0, y, 7*m_widthCol, m_heightRow) )

     {
 #if DEBUG_PAINT
         wxLogDebug("painting the header");
     {
 #if DEBUG_PAINT
         wxLogDebug("painting the header");


@@ -595,7 +895,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.SetTextForeground(m_colHeaderFg);
         dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
         dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));
         dc.SetTextForeground(m_colHeaderFg);
         dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
         dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));

-        dc.DrawRectangle(0, 0, 7*m_widthCol, m_heightRow);
+        dc.DrawRectangle(0, y, 7*m_widthCol, m_heightRow);

 
         bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0;
         for ( size_t wd = 0; wd < 7; wd++ )
 
         bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0;
         for ( size_t wd = 0; wd < 7; wd++ )


@@ -605,8 +905,10 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                 n = wd == 6 ? 0 : wd + 1;
             else
                 n = wd;
                 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], wd*m_widthCol + 1, y);
+            dc.DrawText(m_weekdays[n], (wd*m_widthCol) + ((m_widthCol- dayw) / 2), y); // center the day-name

         }
     }
 
         }
     }
 


@@ -614,9 +916,9 @@ 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
     wxLogDebug("starting calendar from %s\n",
             date.Format("%a %d-%m-%Y %H:%M:%S").c_str());
 #if DEBUG_PAINT
     wxLogDebug("starting calendar from %s\n",
             date.Format("%a %d-%m-%Y %H:%M:%S").c_str());


@@ -650,47 +952,60 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                 bool changedColours = FALSE,
                      changedFont = FALSE;
 
                 bool changedColours = FALSE,
                      changedFont = FALSE;
 

-                wxCalendarDateAttr *attr = m_attrs[day - 1];
+                bool isSel = false;
+                wxCalendarDateAttr *attr = NULL;

 
 

-                bool isSel = date.IsSameDate(m_date);
-                if ( isSel )
+                if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) )

                 {
                 {

-                    dc.SetTextForeground(m_colHighlightFg);
-                    dc.SetTextBackground(m_colHighlightBg);
-
+                    // surrounding week or out-of-range
+                    // draw "disabled"
+                    dc.SetTextForeground(*wxLIGHT_GREY);

                     changedColours = TRUE;
                 }
                     changedColours = TRUE;
                 }

-                else if ( attr )
+                else

                 {
                 {

-                    wxColour colFg, colBg;
-
-                    if ( attr->IsHoliday() )
-                    {
-                        colFg = m_colHolidayFg;
-                        colBg = m_colHolidayBg;
-                    }
-                    else
-                    {
-                        colFg = attr->GetTextColour();
-                        colBg = attr->GetBackgroundColour();
-                    }
+                    isSel = date.IsSameDate(m_date);
+                    attr = m_attrs[day - 1];

 
 

-                    if ( colFg.Ok() )
+                    if ( isSel )

                     {
                     {

-                        dc.SetTextForeground(colFg);
-                        changedColours = TRUE;
-                    }
+                        dc.SetTextForeground(m_colHighlightFg);
+                        dc.SetTextBackground(m_colHighlightBg);

 
 

-                    if ( colBg.Ok() )
-                    {
-                        dc.SetTextBackground(colBg);

                         changedColours = TRUE;
                     }
                         changedColours = TRUE;
                     }

-
-                    if ( attr->HasFont() )
+                    else if ( attr )

                     {
                     {

-                        dc.SetFont(attr->GetFont());
-                        changedFont = TRUE;
+                        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;
+                        }

                     }
                 }
 
                     }
                 }
 


@@ -746,6 +1061,32 @@ 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
     wxLogDebug("+++ finished painting");
 #endif
 #if DEBUG_PAINT
     wxLogDebug("+++ finished painting");
 #endif


@@ -761,7 +1102,9 @@ void wxCalendarCtrl::RefreshDate(const wxDateTime& date)
     // the whole row anyhow - and this allows the small optimisation in
     // OnClick() below to work
     rect.x = 0;
     // 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.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;
 


@@ -784,6 +1127,184 @@ void wxCalendarCtrl::RefreshDate(const wxDateTime& date)
     Refresh(TRUE, &rect);
 }
 
     Refresh(TRUE, &rect);
 }
 

+void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pPen, 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 seperate intervals
+                wxDateTime tfd = fromdate + wxDateSpan::Days(7-fd);
+                wxDateTime ftd = tfd + wxDateSpan::Day();
+#if DEBUG_PAINT
+                wxLogDebug("Highlight: Seperate segments");
+#endif
+                // draw seperately
+                HighlightRange(pDC, fromdate, tfd, pPen, pBrush);
+                HighlightRange(pDC, ftd, todate, pPen, pBrush);
+            }
+            else
+            {
+                int numpoints;
+                wxPoint corners[8]; // potentially 8 corners in polygon
+
+                if ( fw == tw )
+                {
+                    // simple case: same week
+                    numpoints = 4;
+                    corners[0] = wxPoint((fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset);
+                    corners[1] = wxPoint((fd - 1) * m_widthCol, ((fw + 1 ) * m_heightRow) + m_rowOffset);
+                    corners[2] = wxPoint(td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset);
+                    corners[3] = wxPoint(td * m_widthCol, (tw * m_heightRow) + m_rowOffset);
+                }
+                else
+                {
+                    int cidx = 0;
+                    // "complex" polygon
+                    corners[cidx] = wxPoint((fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
+                    
+                    if ( fd > 1 )
+                    {
+                        corners[cidx] = wxPoint((fd - 1) * m_widthCol, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
+                        corners[cidx] = wxPoint(0, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
+                    }
+
+                    corners[cidx] = wxPoint(0, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
+                    corners[cidx] = wxPoint(td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
+
+                    if ( td < 7 )
+                    {
+                        corners[cidx] = wxPoint(td * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
+                        corners[cidx] = wxPoint(7 * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
+                    }
+
+                    corners[cidx] = wxPoint(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;
+}
+

 // ----------------------------------------------------------------------------
 // mouse handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // mouse handling
 // ----------------------------------------------------------------------------


@@ -807,10 +1328,13 @@ 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);

 
 

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

             break;
 
         case wxCAL_HITTEST_HEADER:
             break;
 
         case wxCAL_HITTEST_HEADER:


@@ -821,6 +1345,12 @@ void wxCalendarCtrl::OnClick(wxMouseEvent& event)
             }
             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


@@ -837,25 +1367,79 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
 {
     RecalcGeometry();
 
 {
     RecalcGeometry();
 

-    int wday = pos.x / m_widthCol;
-

     wxCoord y = pos.y;
     wxCoord y = pos.y;

-    if ( y < m_heightRow )
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+    if ( (GetWindowStyle() & 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 ( wxRegion(m_leftArrowRect).Contains(pos) == wxInRegion )

         {
         {

-            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;

         }
 
         }
 

-        return wxCAL_HITTEST_HEADER;
+        if ( wxRegion(m_rightArrowRect).Contains(pos) == wxInRegion )
+        {
+            if ( date )
+            {
+                if ( IsDateInRange(m_date + wxDateSpan::Month()) )
+                {
+                    *date = m_date + wxDateSpan::Month();
+                }
+                else
+                {
+                    *date = GetUpperDateLimit();
+                }
+            }
+
+            return wxCAL_HITTEST_INCMONTH;
+        }
+
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Header: Days
+    int wday = pos.x / m_widthCol;
+//    if ( y < m_heightRow )
+    if ( y < (m_heightRow + m_rowOffset) )
+    {
+        if ( 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 = (y - m_heightRow) / m_heightRow;
+//    int week = (y - m_heightRow) / m_heightRow;
+    int week = (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;


@@ -868,7 +1452,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
     {


@@ -890,7 +1482,10 @@ void wxCalendarCtrl::OnMonthChange(wxCommandEvent& event)
         tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year);
     }
 
         tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year);
     }
 

-    SetDateAndNotify(wxDateTime(tm.mday, mon, tm.year));
+    wxDateTime target = wxDateTime(tm.mday, mon, tm.year);
+
+    ChangeMonth(&target);
+    SetDateAndNotify(target);

 }
 
 void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
 }
 
 void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)


@@ -902,8 +1497,20 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
     {
         tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
     }
     {
         tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
     }

+    
+    wxDateTime target = wxDateTime(tm.mday, tm.mon, year);
+
+    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());
+    }

 
 

-    SetDateAndNotify(wxDateTime(tm.mday, tm.mon, year));

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


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

+    wxDateTime target;

     switch ( event.KeyCode() )
     {
         case _T('+'):
         case WXK_ADD:
     switch ( event.KeyCode() )
     {
         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;
 
         case WXK_PRIOR:
             break;
 
         case WXK_PRIOR:

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

             break;
 
         case WXK_NEXT:
             break;
 
         case WXK_NEXT:

-            SetDateAndNotify(m_date + wxDateSpan::Month());
+            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;