added SetDoubleBuffered() (patch 1491093)

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index f21d61a1c0b3e103e69756887211dbec340472a6..3af0091d420999604966ed834424e9285f73b463 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:


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"
 


@@ -63,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


@@ -179,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


@@ -198,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;


@@ -235,7 +240,7 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
 
     // Since we don't paint the whole background make sure that the platform
     // will use the right one.
 
     // 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();
 


@@ -755,9 +760,9 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
         height += m_spinYear->GetBestSize().y;
 
 
         height += m_spinYear->GetBestSize().y;
 
 

-       wxCoord w2= m_comboMonth->GetBestSize().x + HORZ_MARGIN + GetCharWidth()*6;
-       if (width < w2)
-         width=w2;
+        wxCoord w2 = m_comboMonth->GetBestSize().x + HORZ_MARGIN + GetCharWidth()*6;
+        if (width < w2)
+            width = w2;

     }
 
     if ( !HasFlag(wxBORDER_NONE) )
     }
 
     if ( !HasFlag(wxBORDER_NONE) )


@@ -840,12 +845,11 @@ void wxCalendarCtrl::RecalcGeometry()
     wxClientDC dc(this);
 
     dc.SetFont(GetFont());
     wxClientDC dc(this);
 
     dc.SetFont(GetFont());

-    int day = 10;

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

-    for ( day = 10; day <= 31; day++)
+    for ( int day = 10; day <= 31; day++)

     {
         wxCoord width;
         dc.GetTextExtent(wxString::Format(wxT("%d"), day), &width, &m_heightRow);
     {
         wxCoord width;
         dc.GetTextExtent(wxString::Format(wxT("%d"), day), &width, &m_heightRow);


@@ -893,8 +897,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) )
     {


@@ -944,8 +947,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);


@@ -954,8 +957,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);


@@ -966,7 +969,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");


@@ -979,7 +982,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);
 
         bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0;
         dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);
 
         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 )
         {
             size_t n;
             if ( startOnMonday )


@@ -1008,7 +1011,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();
 


@@ -1019,8 +1022,9 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         wxLogDebug("painting week %d at y = %d\n", nWeek, y);
 #endif
 
         wxLogDebug("painting week %d at y = %d\n", nWeek, y);
 #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


@@ -1039,7 +1043,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


@@ -1181,7 +1185,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;
 


@@ -1207,7 +1211,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


@@ -1233,13 +1237,13 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate,
             if ( ( (tw - fw) == 1 ) && ( td < fd ) )
             {
                 // special case: interval 7 days or less not in same week
             if ( ( (tw - fw) == 1 ) && ( td < fd ) )
             {
                 // special case: interval 7 days or less not in same week

-                // split in two seperate intervals
+                // split in two separate intervals

                 wxDateTime tfd = fromdate + wxDateSpan::Days(7-fd);
                 wxDateTime ftd = tfd + wxDateSpan::Day();
 #if DEBUG_PAINT
                 wxDateTime tfd = fromdate + wxDateSpan::Days(7-fd);
                 wxDateTime ftd = tfd + wxDateSpan::Day();
 #if DEBUG_PAINT

-                wxLogDebug("Highlight: Seperate segments");
+                wxLogDebug("Highlight: Separate segments");

 #endif
 #endif

-                // draw seperately
+                // draw separately

                 HighlightRange(pDC, fromdate, tfd, pPen, pBrush);
                 HighlightRange(pDC, ftd, todate, pPen, pBrush);
             }
                 HighlightRange(pDC, fromdate, tfd, pPen, pBrush);
                 HighlightRange(pDC, ftd, todate, pPen, pBrush);
             }


@@ -1247,38 +1251,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;
                 }


@@ -1419,9 +1424,9 @@ void wxCalendarCtrl::OnClick(wxMouseEvent& event)
 
         case wxCAL_HITTEST_HEADER:
             {
 
         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;
 


@@ -1446,8 +1451,12 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
                                                 wxDateTime::WeekDay *wd)
 {
     RecalcGeometry();
                                                 wxDateTime::WeekDay *wd)
 {
     RecalcGeometry();

+    // use the correct x-pos
+    wxCoord x0 = wxMax((GetSize().x - m_widthCol*7) /2, 0);
+    wxPoint pos_corr = pos;
+    pos_corr.x -= x0;

 
 

-    wxCoord y = pos.y;
+    wxCoord y = pos_corr.y;

 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
     if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
     if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )


@@ -1456,7 +1465,7 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
 
         // we need to find out if the hit is on left arrow, on month or on right arrow
         // left arrow?
 
         // 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 ( wxRegion(m_leftArrowRect).Contains(pos_corr) == wxInRegion )

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


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

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

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


@@ -1494,7 +1503,8 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
     // Header: Days
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
     // Header: Days

-    int wday = pos.x / m_widthCol;
+
+    int wday = pos_corr.x / m_widthCol;

 //    if ( y < m_heightRow )
     if ( y < (m_heightRow + m_rowOffset) )
     {
 //    if ( y < m_heightRow )
     if ( y < (m_heightRow + m_rowOffset) )
     {


@@ -1604,6 +1614,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
 // ----------------------------------------------------------------------------


@@ -1631,13 +1655,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


@@ -1783,4 +1807,3 @@ wxCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 }
 
 #endif // wxUSE_CALENDARCTRL
 }
 
 #endif // wxUSE_CALENDARCTRL

-