Bring back double border

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 854e28ed0018fd6436cb0dc180312f1f9e3186d8..a76d41f1b8f080f77285111437aacc29b7b472b4 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implementation fo the generic wxCalendarCtrl
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation fo the generic wxCalendarCtrl
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -59,6 +59,8 @@ 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)

+
+    EVT_SYS_COLOUR_CHANGED(wxCalendarCtrl::OnSysColourChanged)

 END_EVENT_TABLE()
 
 #if wxUSE_EXTENDED_RTTI
 END_EVENT_TABLE()
 
 #if wxUSE_EXTENDED_RTTI


@@ -175,8 +177,15 @@ void wxCalendarCtrl::Init()
         m_attrs[n] = NULL;
     }
 
         m_attrs[n] = NULL;
     }
 

+    InitColours();
+}
+
+void wxCalendarCtrl::InitColours()
+{

     m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
     m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
     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_colHolidayFg = *wxRED;
     // don't set m_colHolidayBg - by default, same as our bg colour


@@ -194,7 +203,7 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
                             const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size,
                             const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size,

-                            style | wxCLIP_CHILDREN | wxWANTS_CHARS,
+                            style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE,

                             wxDefaultValidator, name) )
     {
         return false;
                             wxDefaultValidator, name) )
     {
         return false;


@@ -226,12 +235,12 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
     // we need to set the position as well because the main control position
     // is not the same as the one specified in pos if we have the controls
     // above it
     // we need to set the position as well because the main control position
     // is not the same as the one specified in pos if we have the controls
     // above it

-    SetBestSize(size);
+    SetInitialSize(size);

     SetPosition(pos);
 
     // Since we don't paint the whole background make sure that the platform
     // will use the right one.
     SetPosition(pos);
 
     // Since we don't paint the whole background make sure that the platform
     // will use the right one.

-    SetBackgroundColour(GetBackgroundColour());
+    SetBackgroundColour(m_colBackground);

 
     SetHolidayAttrs();
 
 
     SetHolidayAttrs();
 


@@ -244,6 +253,25 @@ wxCalendarCtrl::~wxCalendarCtrl()
     {
         delete m_attrs[n];
     }
     {
         delete m_attrs[n];
     }

+
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    {
+        delete m_comboMonth;
+        delete m_staticMonth;
+        delete m_spinYear;
+        delete m_staticYear;
+    }
+}
+
+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") );
+
+    wxControl::SetWindowStyleFlag(style);

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


@@ -385,6 +413,7 @@ void wxCalendarCtrl::ShowCurrentControls()
         m_spinYear->Hide();
         m_staticYear->Show();
     }
         m_spinYear->Hide();
         m_staticYear->Show();
     }

+    //else: these controls are not even created, don't show/hide them

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


@@ -779,21 +808,32 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     int yDiff;
 
 {
     int yDiff;
 

-    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth )

     {
     {

-        wxSize sizeCombo = m_comboMonth->GetSize();
+        wxSize sizeCombo = m_comboMonth->GetEffectiveMinSize();

         wxSize sizeStatic = m_staticMonth->GetSize();
         wxSize sizeSpin = m_spinYear->GetSize();
         wxSize sizeStatic = m_staticMonth->GetSize();
         wxSize sizeSpin = m_spinYear->GetSize();

-        int dy = (sizeCombo.y - sizeStatic.y) / 2;
+
+        // 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_comboMonth->Move(x, y);

-        m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
+        m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1, sizeStatic.y);

 
         int xDiff = sizeCombo.x + HORZ_MARGIN;
 
 
         int xDiff = sizeCombo.x + HORZ_MARGIN;
 

-        m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
+        m_spinYear->SetSize(x + xDiff, y, width - xDiff, requiredSpinHeight);

         m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
 
         m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
 

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

     }
     else // no controls on the top
     {
     }
     else // no controls on the top
     {


@@ -806,8 +846,8 @@ 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);

-
-    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+#ifndef __WXPM__
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && GetMonthControl() )

     {
         // our real top corner is not in this position
         if ( y )
     {
         // our real top corner is not in this position
         if ( y )


@@ -815,13 +855,14 @@ void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
             *y -= GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
     }
             *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);

-
-    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+#ifndef __WXPM__
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
         // our real height is bigger
         if ( height && GetMonthControl())
     {
         // our real height is bigger
         if ( height && GetMonthControl())


@@ -829,6 +870,7 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const
             *height += GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
     }
             *height += GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
     }

+#endif

 }
 
 void wxCalendarCtrl::RecalcGeometry()
 }
 
 void wxCalendarCtrl::RecalcGeometry()


@@ -866,7 +908,7 @@ void wxCalendarCtrl::RecalcGeometry()
     m_widthCol += 2;
     m_heightRow += 2;
 
     m_widthCol += 2;
     m_heightRow += 2;
 

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

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


@@ -888,8 +930,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 #endif
 
     wxCoord y = 0;
 #endif
 
     wxCoord y = 0;

-    wxCoord x0 = (GetSize().x - m_widthCol*7) /2;
-    if (x0 < 0) x0 = 0;
+    wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );

 
     if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
     {
 
     if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
     {


@@ -939,8 +980,8 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
             if ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) )
             {
                 m_leftArrowRect = wxRect(larrowx - 3, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
             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.SetBrush(*wxBLACK_BRUSH);
+                dc.SetPen(*wxBLACK_PEN);

                 dc.DrawPolygon(3, leftarrow, larrowx , arrowy, wxWINDING_RULE);
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRectangle(m_leftArrowRect);
                 dc.DrawPolygon(3, leftarrow, larrowx , arrowy, wxWINDING_RULE);
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRectangle(m_leftArrowRect);


@@ -949,8 +990,8 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
             if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) )
             {
                 m_rightArrowRect = wxRect(rarrowx - 4, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
             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.SetBrush(*wxBLACK_BRUSH);
+                dc.SetPen(*wxBLACK_PEN);

                 dc.DrawPolygon(3, rightarrow, rarrowx , arrowy, wxWINDING_RULE);
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRectangle(m_rightArrowRect);
                 dc.DrawPolygon(3, rightarrow, rarrowx , arrowy, wxWINDING_RULE);
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRectangle(m_rightArrowRect);


@@ -961,7 +1002,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     }
 
     // first draw the week days
     }
 
     // first draw the week days

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

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


@@ -1003,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();
 


@@ -1016,6 +1057,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 
         for ( int 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


@@ -1034,7 +1076,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
                 {
                     // surrounding week or out-of-range
                     // draw "disabled"
                 {
                     // surrounding week or out-of-range
                     // draw "disabled"

-                    dc.SetTextForeground(*wxLIGHT_GREY);
+                    dc.SetTextForeground(m_colSorrounding);

                     changedColours = true;
                 }
                 else
                     changedColours = true;
                 }
                 else


@@ -1176,7 +1218,7 @@ 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.x = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );

 
     rect.y = (m_heightRow * GetWeek(date)) + m_rowOffset;
 
 
     rect.y = (m_heightRow * GetWeek(date)) + m_rowOffset;
 


@@ -1202,7 +1244,7 @@ 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)
+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
 {
     // Highlights the given range using pen and brush
     // Does nothing if todate < fromdate


@@ -1242,38 +1284,39 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate,
             {
                 int numpoints;
                 wxPoint corners[8]; // potentially 8 corners in polygon
             {
                 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;
 
                 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);
+                    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
                 }
                 else
                 {
                     int cidx = 0;
                     // "complex" polygon

-                    corners[cidx] = wxPoint((fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
+                    corners[cidx] = wxPoint(x0 + (fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;

 
                     if ( fd > 1 )
                     {
 
                     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(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(0, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
-                    corners[cidx] = wxPoint(td * m_widthCol, ((tw + 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 )
                     {
 
                     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(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(7 * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
+                    corners[cidx] = wxPoint(x0 + 7 * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;

 
                     numpoints = cidx;
                 }
 
                     numpoints = cidx;
                 }


@@ -1442,16 +1485,16 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
 {
     RecalcGeometry();
 
 {
     RecalcGeometry();
 

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

 
 

-///////////////////////////////////////////////////////////////////////////////////////////////////////
-    if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+    if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
         // Header: month
 
         // we need to find out if the hit is on left arrow, on month or on right arrow
         // left arrow?
     {
         // 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 ( m_leftArrowRect.Contains(pos) )

         {
             if ( date )
             {
         {
             if ( date )
             {


@@ -1468,7 +1511,7 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
             return wxCAL_HITTEST_DECMONTH;
         }
 
             return wxCAL_HITTEST_DECMONTH;
         }
 

-        if ( wxRegion(m_rightArrowRect).Contains(pos) == wxInRegion )
+        if ( m_rightArrowRect.Contains(pos) )

         {
             if ( date )
             {
         {
             if ( date )
             {


@@ -1487,13 +1530,11 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
 
     }
 
 
     }
 

-///////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Header: Days
-    int wday = pos.x / m_widthCol;
-//    if ( y < m_heightRow )
-    if ( y < (m_heightRow + m_rowOffset) )
+    // header: week days
+    int wday = (pos.x - x0) / m_widthCol;
+    if ( pos.y < (m_heightRow + m_rowOffset) )

     {
     {

-        if ( y > m_rowOffset )
+        if ( pos.y > m_rowOffset )

         {
             if ( wd )
             {
         {
             if ( wd )
             {


@@ -1513,8 +1554,7 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
         }
     }
 
         }
     }
 

-//    int week = (y - m_heightRow) / m_heightRow;
-    int week = (y - (m_heightRow + m_rowOffset)) / m_heightRow;
+    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;


@@ -1599,6 +1639,20 @@ void wxCalendarCtrl::OnYearTextChange(wxCommandEvent& event)
     OnYearChange(event);
 }
 
     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();
+}
+

 // ----------------------------------------------------------------------------
 // keyboard interface
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // keyboard interface
 // ----------------------------------------------------------------------------


@@ -1626,13 +1680,13 @@ void wxCalendarCtrl::OnChar(wxKeyEvent& event)
             }
             break;
 
             }
             break;
 

-        case WXK_PRIOR:
+        case WXK_PAGEUP:

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

-        case WXK_NEXT:
+        case WXK_PAGEDOWN:

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