X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b70462f4f790b87f51e34c279837efb75545be28..7ea1c917764fb2588fe1aadc75c49ba300f8cb2f:/src/generic/calctrl.cpp diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index 9c70985528..de55a2c286 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: generic/calctrl.cpp +// Name: src/generic/calctrl.cpp // Purpose: implementation fo the generic wxCalendarCtrl // Author: Vadim Zeitlin // Modified by: // Created: 29.12.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "calctrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,44 +29,24 @@ #include "wx/settings.h" #include "wx/brush.h" #include "wx/combobox.h" + #include "wx/listbox.h" #include "wx/stattext.h" + #include "wx/textctrl.h" #endif //WX_PRECOMP #if wxUSE_CALENDARCTRL -#include "wx/calctrl.h" - -#define DEBUG_PAINT 0 +#include "wx/spinctrl.h" -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -class wxMonthComboBox : public wxComboBox -{ -public: - wxMonthComboBox(wxCalendarCtrl *cal); - - void OnMonthChange(wxCommandEvent& event) { m_cal->OnMonthChange(event); } - -private: - wxCalendarCtrl *m_cal; - - DECLARE_EVENT_TABLE() -}; - -class wxYearSpinCtrl : public wxSpinCtrl -{ -public: - wxYearSpinCtrl(wxCalendarCtrl *cal); - - void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); } +// if wxDatePickerCtrl code doesn't define the date event, do it here as we +// need it as well +#if !wxUSE_DATEPICKCTRL + #define _WX_DEFINE_DATE_EVENTS_ +#endif -private: - wxCalendarCtrl *m_cal; +#include "wx/calctrl.h" - DECLARE_EVENT_TABLE() -}; +#define DEBUG_PAINT 0 // ---------------------------------------------------------------------------- // wxWin macros @@ -83,18 +59,68 @@ BEGIN_EVENT_TABLE(wxCalendarCtrl, wxControl) EVT_LEFT_DOWN(wxCalendarCtrl::OnClick) EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick) -END_EVENT_TABLE() - -BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox) - EVT_COMBOBOX(-1, wxMonthComboBox::OnMonthChange) -END_EVENT_TABLE() -BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl) - EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange) + EVT_SYS_COLOUR_CHANGED(wxCalendarCtrl::OnSysColourChanged) END_EVENT_TABLE() +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxCalendarCtrlStyle ) + +wxBEGIN_FLAGS( wxCalendarCtrlStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxCAL_SUNDAY_FIRST) + wxFLAGS_MEMBER(wxCAL_MONDAY_FIRST) + wxFLAGS_MEMBER(wxCAL_SHOW_HOLIDAYS) + wxFLAGS_MEMBER(wxCAL_NO_YEAR_CHANGE) + wxFLAGS_MEMBER(wxCAL_NO_MONTH_CHANGE) + wxFLAGS_MEMBER(wxCAL_SEQUENTIAL_MONTH_SELECTION) + wxFLAGS_MEMBER(wxCAL_SHOW_SURROUNDING_WEEKS) + +wxEND_FLAGS( wxCalendarCtrlStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl, wxControl,"wx/calctrl.h") + +wxBEGIN_PROPERTIES_TABLE(wxCalendarCtrl) + wxEVENT_RANGE_PROPERTY( Updated , wxEVT_CALENDAR_SEL_CHANGED , wxEVT_CALENDAR_WEEKDAY_CLICKED , wxCalendarEvent ) + wxHIDE_PROPERTY( Children ) + wxPROPERTY( Date,wxDateTime, SetDate , GetDate, , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxCalendarCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxCalendarCtrl) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_6( wxCalendarCtrl , wxWindow* , Parent , wxWindowID , Id , wxDateTime , Date , wxPoint , Position , wxSize , Size , long , WindowStyle ) +#else IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent) +#endif +IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent) // ---------------------------------------------------------------------------- // events @@ -112,48 +138,30 @@ DEFINE_EVENT_TYPE(wxEVT_CALENDAR_WEEKDAY_CLICKED) // ============================================================================ // ---------------------------------------------------------------------------- -// wxMonthComboBox and wxYearSpinCtrl +// wxCalendarCtrl // ---------------------------------------------------------------------------- -wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal) - : wxComboBox(cal->GetParent(), -1, - wxEmptyString, - wxDefaultPosition, - wxDefaultSize, - 0, NULL, - wxCB_READONLY | wxCLIP_SIBLINGS) +wxCalendarCtrl::wxCalendarCtrl(wxWindow *parent, + wxWindowID id, + const wxDateTime& date, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { - m_cal = cal; - - wxDateTime::Month m; - for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) - { - Append(wxDateTime::GetMonthName(m)); - } - - SetSelection(m_cal->GetDate().GetMonth()); - SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); -} + Init(); -wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal) - : wxSpinCtrl(cal->GetParent(), -1, - cal->GetDate().Format(_T("%Y")), - wxDefaultPosition, - wxDefaultSize, - wxSP_ARROW_KEYS | wxCLIP_SIBLINGS, - -4300, 10000, cal->GetDate().GetYear()) -{ - m_cal = cal; + (void)Create(parent, id, date, pos, size, style, name); } -// ---------------------------------------------------------------------------- -// wxCalendarCtrl -// ---------------------------------------------------------------------------- - void wxCalendarCtrl::Init() { m_comboMonth = NULL; m_spinYear = NULL; + m_staticYear = NULL; + m_staticMonth = NULL; + + m_userChangedYear = false; m_widthCol = m_heightRow = 0; @@ -169,8 +177,15 @@ void wxCalendarCtrl::Init() m_attrs[n] = NULL; } + InitColours(); +} + +void wxCalendarCtrl::InitColours() +{ m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); + m_colBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + m_colSorrounding = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); m_colHolidayFg = *wxRED; // don't set m_colHolidayBg - by default, same as our bg colour @@ -188,10 +203,10 @@ bool wxCalendarCtrl::Create(wxWindow *parent, 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; + return false; } // needed to get the arrow keys normally used for the dialog navigation @@ -202,43 +217,34 @@ bool wxCalendarCtrl::Create(wxWindow *parent, m_lowdate = wxDefaultDateTime; m_highdate = wxDefaultDateTime; - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) + if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { - m_spinYear = new wxYearSpinCtrl(this); - m_staticYear = new wxStaticText(GetParent(), -1, m_date.Format(_T("%Y")), + CreateYearSpinCtrl(); + m_staticYear = new wxStaticText(GetParent(), wxID_ANY, 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")), + CreateMonthComboBox(); + m_staticMonth = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%B")), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE); } ShowCurrentControls(); - wxSize sizeReal; - if ( size.x == -1 || size.y == -1 ) - { - sizeReal = DoGetBestSize(); - if ( size.x != -1 ) - sizeReal.x = size.x; - if ( size.y != -1 ) - sizeReal.y = size.y; - } - else - { - sizeReal = size; - } - - SetSize(sizeReal); + // 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); + SetPosition(pos); - SetBackgroundColour(*wxWHITE); - SetFont(*wxSWISS_FONT); + // Since we don't paint the whole background make sure that the platform + // will use the right one. + SetBackgroundColour(m_colBackground); SetHolidayAttrs(); - return TRUE; + return true; } wxCalendarCtrl::~wxCalendarCtrl() @@ -249,18 +255,74 @@ wxCalendarCtrl::~wxCalendarCtrl() } } +// ---------------------------------------------------------------------------- +// Create the wxComboBox and wxSpinCtrl +// ---------------------------------------------------------------------------- + +void wxCalendarCtrl::CreateMonthComboBox() +{ + m_comboMonth = new wxComboBox(GetParent(), wxID_ANY, + wxEmptyString, + wxDefaultPosition, + wxDefaultSize, + 0, NULL, + wxCB_READONLY | wxCLIP_SIBLINGS); + + wxDateTime::Month m; + for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) + { + m_comboMonth->Append(wxDateTime::GetMonthName(m)); + } + + m_comboMonth->SetSelection(GetDate().GetMonth()); + m_comboMonth->SetSize(wxDefaultCoord, + wxDefaultCoord, + wxDefaultCoord, + wxDefaultCoord, + wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); + + m_comboMonth->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, + wxCommandEventHandler(wxCalendarCtrl::OnMonthChange), + NULL, this); +} + +void wxCalendarCtrl::CreateYearSpinCtrl() +{ + m_spinYear = new wxSpinCtrl(GetParent(), wxID_ANY, + GetDate().Format(_T("%Y")), + wxDefaultPosition, + wxDefaultSize, + wxSP_ARROW_KEYS | wxCLIP_SIBLINGS, + -4300, 10000, GetDate().GetYear()); + + m_spinYear->Connect(wxEVT_COMMAND_TEXT_UPDATED, + wxCommandEventHandler(wxCalendarCtrl::OnYearTextChange), + NULL, this); + + m_spinYear->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, + wxCommandEventHandler(wxCalendarCtrl::OnYearChange), + NULL, this); +} + // ---------------------------------------------------------------------------- // forward wxWin functions to subcontrols // ---------------------------------------------------------------------------- bool wxCalendarCtrl::Destroy() { - if( m_staticYear ) m_staticYear->Destroy(); - if( m_spinYear ) m_spinYear->Destroy(); - if( m_comboMonth ) m_comboMonth->Destroy(); - if( m_staticMonth ) m_staticMonth->Destroy(); - - m_staticYear = 0; m_spinYear = 0; m_comboMonth = 0; m_staticMonth = 0; + if ( m_staticYear ) + m_staticYear->Destroy(); + if ( m_spinYear ) + m_spinYear->Destroy(); + if ( m_comboMonth ) + m_comboMonth->Destroy(); + if ( m_staticMonth ) + m_staticMonth->Destroy(); + + m_staticYear = NULL; + m_spinYear = NULL; + m_comboMonth = NULL; + m_staticMonth = NULL; return wxControl::Destroy(); } @@ -269,7 +331,7 @@ bool wxCalendarCtrl::Show(bool show) { if ( !wxControl::Show(show) ) { - return FALSE; + return false; } if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) @@ -281,14 +343,14 @@ bool wxCalendarCtrl::Show(bool show) } } - return TRUE; + return true; } bool wxCalendarCtrl::Enable(bool enable) { if ( !wxControl::Enable(enable) ) { - return FALSE; + return false; } if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) @@ -297,7 +359,7 @@ bool wxCalendarCtrl::Enable(bool enable) GetYearControl()->Enable(enable); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -306,7 +368,7 @@ bool wxCalendarCtrl::Enable(bool enable) void wxCalendarCtrl::ShowCurrentControls() { - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) + if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { if ( AllowMonthChange() ) { @@ -388,7 +450,7 @@ void wxCalendarCtrl::EnableMonthChange(bool enable) bool wxCalendarCtrl::SetDate(const wxDateTime& date) { - bool retval = FALSE; + bool retval = true; bool sameMonth = m_date.GetMonth() == date.GetMonth(), sameYear = m_date.GetYear() == date.GetYear(); @@ -398,40 +460,43 @@ bool wxCalendarCtrl::SetDate(const wxDateTime& date) if ( sameMonth && sameYear ) { // just change the day - retval = TRUE; ChangeDay(date); } else { - if ( !AllowMonthChange() || (!AllowYearChange() && !sameYear) ) + if ( AllowMonthChange() && (AllowYearChange() || sameYear) ) { - // forbidden - return retval; - } - - // change everything - retval = TRUE; - m_date = date; - - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - // update the controls - m_comboMonth->SetSelection(m_date.GetMonth()); + // change everything + m_date = date; - if ( AllowYearChange() ) + if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { - m_spinYear->SetValue(m_date.Format(_T("%Y"))); + // update the controls + m_comboMonth->SetSelection(m_date.GetMonth()); + + if ( AllowYearChange() ) + { + if ( !m_userChangedYear ) + m_spinYear->SetValue(m_date.Format(_T("%Y"))); + } } - } - // as the month changed, holidays did too - SetHolidayAttrs(); + // as the month changed, holidays did too + SetHolidayAttrs(); - // update the calendar - Refresh(); + // update the calendar + Refresh(); + } + else + { + // forbidden + retval = false; + } } } + m_userChangedYear = false; + return retval; } @@ -481,15 +546,15 @@ void wxCalendarCtrl::SetDateAndNotify(const wxDateTime& date) bool wxCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDateTime */) { - bool retval = TRUE; + bool retval = true; - if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : TRUE ) ) + if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) ) { m_lowdate = date; } else { - retval = FALSE; + retval = false; } return retval; @@ -497,15 +562,15 @@ bool wxCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDate bool wxCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDateTime */) { - bool retval = TRUE; + bool retval = true; - if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE ) ) + if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) ) { m_highdate = date; } else { - retval = FALSE; + retval = false; } return retval; @@ -513,18 +578,18 @@ bool wxCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDate bool wxCalendarCtrl::SetDateRange(const wxDateTime& lowerdate /* = wxDefaultDateTime */, const wxDateTime& upperdate /* = wxDefaultDateTime */) { - bool retval = TRUE; + bool retval = true; if ( - ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : TRUE ) ) && - ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : TRUE ) ) ) + ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : true ) ) && + ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : true ) ) ) { m_lowdate = lowerdate; m_highdate = upperdate; } else { - retval = FALSE; + retval = false; } return retval; @@ -564,22 +629,20 @@ bool wxCalendarCtrl::IsDateShown(const wxDateTime& date) const } else { - return TRUE; + 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; + return ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) + && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) ); } bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const { - bool retval = FALSE; + bool retval = false; if ( !(IsDateInRange(*target)) ) { @@ -588,7 +651,7 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const if ( target->GetYear() >= GetLowerDateLimit().GetYear() ) { *target = GetLowerDateLimit(); - retval = TRUE; + retval = true; } else { @@ -600,7 +663,7 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const if ( target->GetYear() <= GetUpperDateLimit().GetYear() ) { *target = GetUpperDateLimit(); - retval = TRUE; + retval = true; } else { @@ -610,7 +673,7 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const } else { - retval = TRUE; + retval = true; } return retval; @@ -618,11 +681,11 @@ bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const bool wxCalendarCtrl::ChangeMonth(wxDateTime* target) const { - bool retval = TRUE; + bool retval = true; if ( !(IsDateInRange(*target)) ) { - retval = FALSE; + retval = false; if ( target->GetMonth() < m_date.GetMonth() ) { @@ -677,37 +740,41 @@ size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const // the constants used for the layout #define VERT_MARGIN 5 // distance between combo and calendar +#ifdef __WXMAC__ +#define HORZ_MARGIN 5 // spin +#else #define HORZ_MARGIN 15 // spin - +#endif wxSize wxCalendarCtrl::DoGetBestSize() const { // calc the size of the calendar ((wxCalendarCtrl *)this)->RecalcGeometry(); // const_cast wxCoord width = 7*m_widthCol, - height = 7*m_heightRow + m_rowOffset; + height = 7*m_heightRow + m_rowOffset + VERT_MARGIN; - // the combobox doesn't report its height correctly (it returns the - // height including the drop down list) so don't use it - - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) + if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { - height += VERT_MARGIN + m_spinYear->GetBestSize().y; - } - else - { - height += VERT_MARGIN; + // the combobox doesn't report its height correctly (it returns the + // height including the drop down list) so don't use it + height += m_spinYear->GetBestSize().y; + + + wxCoord w2 = m_comboMonth->GetBestSize().x + HORZ_MARGIN + GetCharWidth()*6; + if (width < w2) + width = w2; } -// if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) ) // This doesn't work. Default is wxBORDER_DEFAULT (0) - if ( !(GetWindowStyle() & wxBORDER_NONE) ) + if ( !HasFlag(wxBORDER_NONE) ) { // the border would clip the last line otherwise height += 6; width += 4; } - return wxSize(width, height); + wxSize best(width, height); + CacheBestSize(best); + return best; } void wxCalendarCtrl::DoSetSize(int x, int y, @@ -719,27 +786,28 @@ void wxCalendarCtrl::DoSetSize(int x, int y, void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height) { - int xDiff = 0; - int yDiff = 0; + int yDiff; - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) + if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { wxSize sizeCombo = m_comboMonth->GetSize(); wxSize sizeStatic = m_staticMonth->GetSize(); - + wxSize sizeSpin = m_spinYear->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; + 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(); yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN; } + else // no controls on the top + { + yDiff = 0; + } wxControl::DoMoveWindow(x, y + yDiff, width, height - yDiff); } @@ -765,7 +833,7 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { // our real height is bigger - if ( height ) + if ( height && GetMonthControl()) { *height += GetMonthControl()->GetSize().y + VERT_MARGIN; } @@ -774,16 +842,24 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const void wxCalendarCtrl::RecalcGeometry() { - if ( m_widthCol != 0 ) - return; - wxClientDC dc(this); - dc.SetFont(m_font); + dc.SetFont(GetFont()); - // determine the column width (we assume that the weekday names are always - // wider (in any language) than the numbers) + // determine the column width (weekday names are not necessarily wider + // than the numbers (in some languages), so let's not assume that they are) m_widthCol = 0; + for ( int day = 10; day <= 31; day++) + { + wxCoord width; + dc.GetTextExtent(wxString::Format(wxT("%d"), day), &width, &m_heightRow); + if ( width > m_widthCol ) + { + // 1.5 times the width gives nice margins even if the weekday + // names are short + m_widthCol = width+width/2; + } + } wxDateTime::WeekDay wd; for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) ) { @@ -810,7 +886,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - dc.SetFont(m_font); + dc.SetFont(GetFont()); RecalcGeometry(); @@ -821,10 +897,9 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) #endif wxCoord y = 0; + wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 ); -///////////////////////////////////////////////////////////////////////////////////////// - - if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) + if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { // draw the sequential month-selector @@ -832,7 +907,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetTextForeground(*wxBLACK); dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID)); dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID)); - dc.DrawRectangle(0, y, 7*m_widthCol, m_heightRow); + dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow); // Get extent of month-name + year wxCoord monthw, monthh; @@ -840,7 +915,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.GetTextExtent(headertext, &monthw, &monthh); // draw month-name centered above weekdays - wxCoord monthx = ((m_widthCol * 7) - monthw) / 2; + wxCoord monthx = ((m_widthCol * 7) - monthw) / 2 + x0; wxCoord monthy = ((m_heightRow - monthh) / 2) + y; dc.DrawText(headertext, monthx, monthy); @@ -854,37 +929,36 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) leftarrow[1] = wxPoint(arrowheight / 2, 0); leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1); - rightarrow[0] = wxPoint(0, 0); + rightarrow[0] = wxPoint(0,0); rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2); rightarrow[2] = wxPoint(0, arrowheight - 1); // 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); + wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2 + x0; + wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6 + x0; + m_leftArrowRect = m_rightArrowRect = wxRect(0,0,0,0); if ( AllowMonthChange() ) { wxDateTime ldpm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) - wxDateSpan::Day(); // last day prev month // Check if range permits change - if ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? TRUE : AllowYearChange() ) ) + 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); } wxDateTime fdnm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) + wxDateSpan::Month(); // first day next month - if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? TRUE : AllowYearChange() ) ) + if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) ) { m_rightArrowRect = wxRect(rarrowx - 4, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6)); - dc.SetBrush(wxBrush(*wxBLACK, wxSOLID)); - 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); @@ -894,10 +968,8 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) y += m_heightRow; } -///////////////////////////////////////////////////////////////////////////////////////// - // first draw the week days - if ( IsExposed(0, y, 7*m_widthCol, m_heightRow) ) + if ( IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow) ) { #if DEBUG_PAINT wxLogDebug("painting the header"); @@ -907,10 +979,10 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetTextForeground(m_colHeaderFg); dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID)); dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID)); - dc.DrawRectangle(0, y, 7*m_widthCol, m_heightRow); + dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow); 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 ) @@ -919,8 +991,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) n = wd; 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 + dc.DrawText(m_weekdays[n], x0 + (wd*m_widthCol) + ((m_widthCol- dayw) / 2), y); // center the day-name } } @@ -940,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 - if ( !IsExposed(0, y, 7*m_widthCol, m_heightRow - 1) ) + if ( !IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow - 1) ) { date += wxDateSpan::Week(); @@ -951,8 +1022,9 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) 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 @@ -961,18 +1033,18 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) wxCoord width; dc.GetTextExtent(dayStr, &width, (wxCoord *)NULL); - bool changedColours = FALSE, - changedFont = FALSE; + bool changedColours = false, + changedFont = false; - bool isSel = FALSE; + bool isSel = false; wxCalendarDateAttr *attr = NULL; if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) ) { // surrounding week or out-of-range // draw "disabled" - dc.SetTextForeground(*wxLIGHT_GREY); - changedColours = TRUE; + dc.SetTextForeground(m_colSorrounding); + changedColours = true; } else { @@ -984,7 +1056,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetTextForeground(m_colHighlightFg); dc.SetTextBackground(m_colHighlightBg); - changedColours = TRUE; + changedColours = true; } else if ( attr ) { @@ -1004,24 +1076,24 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) if ( colFg.Ok() ) { dc.SetTextForeground(colFg); - changedColours = TRUE; + changedColours = true; } if ( colBg.Ok() ) { dc.SetTextBackground(colBg); - changedColours = TRUE; + changedColours = true; } if ( attr->HasFont() ) { dc.SetFont(attr->GetFont()); - changedFont = TRUE; + changedFont = true; } } } - wxCoord x = wd*m_widthCol + (m_widthCol - width) / 2; + wxCoord x = wd*m_widthCol + (m_widthCol - width) / 2 + x0; dc.DrawText(dayStr, x, y + 1); if ( !isSel && attr && attr->HasBorder() ) @@ -1033,7 +1105,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) } else { - colBorder = m_foregroundColour; + colBorder = GetForegroundColour(); } wxPen pen(colBorder, 1, wxSOLID); @@ -1059,13 +1131,13 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) if ( changedColours ) { - dc.SetTextForeground(m_foregroundColour); - dc.SetTextBackground(m_backgroundColour); + dc.SetTextForeground(GetForegroundColour()); + dc.SetTextBackground(GetBackgroundColour()); } if ( changedFont ) { - dc.SetFont(m_font); + dc.SetFont(GetFont()); } } //else: just don't draw it @@ -1113,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 - rect.x = 0; + rect.x = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 ); rect.y = (m_heightRow * GetWeek(date)) + m_rowOffset; @@ -1136,7 +1208,7 @@ void wxCalendarCtrl::RefreshDate(const wxDateTime& date) rect.x + rect.width, rect.y + rect.height); #endif - Refresh(TRUE, &rect); + Refresh(true, &rect); } void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pPen, wxBrush* pBrush) @@ -1165,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 - // 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 - wxLogDebug("Highlight: Seperate segments"); + wxLogDebug("Highlight: Separate segments"); #endif - // draw seperately + // draw separately HighlightRange(pDC, fromdate, tfd, pPen, pBrush); HighlightRange(pDC, ftd, todate, pPen, pBrush); } @@ -1179,38 +1251,39 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, { int numpoints; wxPoint corners[8]; // potentially 8 corners in polygon + wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 ); if ( fw == tw ) { // simple case: same week numpoints = 4; - corners[0] = wxPoint((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 - 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 ) { - 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 ) { - 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; } @@ -1230,7 +1303,7 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) const { - bool retval = TRUE; + bool retval = true; #if DEBUG_PAINT wxLogDebug("+++ GetDateCoord: (%s) +++", date.Format("%d %m %Y")); @@ -1249,7 +1322,7 @@ bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) c } else { - day += ( startOnMonday ) ? 0 : 1; + *day += ( startOnMonday ) ? 0 : 1; } int targetmonth = date.GetMonth() + (12 * date.GetYear()); @@ -1307,7 +1380,7 @@ bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) c { *day = -1; *week = -1; - retval = FALSE; + retval = false; } #if DEBUG_PAINT @@ -1351,9 +1424,9 @@ void wxCalendarCtrl::OnClick(wxMouseEvent& event) 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; @@ -1378,8 +1451,12 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos, 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) ) @@ -1388,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? - if ( wxRegion(m_leftArrowRect).Contains(pos) == wxInRegion ) + if ( wxRegion(m_leftArrowRect).Contains(pos_corr) == wxInRegion ) { if ( date ) { @@ -1405,7 +1482,7 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos, return wxCAL_HITTEST_DECMONTH; } - if ( wxRegion(m_rightArrowRect).Contains(pos) == wxInRegion ) + if ( wxRegion(m_rightArrowRect).Contains(pos_corr) == wxInRegion ) { if ( date ) { @@ -1426,7 +1503,8 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos, /////////////////////////////////////////////////////////////////////////////////////////////////////// // 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) ) { @@ -1500,11 +1578,17 @@ void wxCalendarCtrl::OnMonthChange(wxCommandEvent& event) SetDateAndNotify(target); } -void wxCalendarCtrl::OnYearChange(wxSpinEvent& event) +void wxCalendarCtrl::OnYearChange(wxCommandEvent& event) { + int year = (int)event.GetInt(); + if ( year == INT_MIN ) + { + // invalid year in the spin control, ignore it + return; + } + wxDateTime::Tm tm = m_date.GetTm(); - int year = (int)event.GetInt(); if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) ) { tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year); @@ -1522,7 +1606,26 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event) // inside the same year but a strange number of months forward/back.. m_spinYear->SetValue(target.GetYear()); } +} + +void wxCalendarCtrl::OnYearTextChange(wxCommandEvent& event) +{ + SetUserChangedYear(); + OnYearChange(event); +} + +// Responds to colour changes, and passes event on to children. +void wxCalendarCtrl::OnSysColourChanged(wxSysColourChangedEvent& event) +{ + // reinit colours + InitColours(); + // Propagate the event to the children + wxControl::OnSysColourChanged(event); + + // Redraw control area + SetBackgroundColour(m_colBackground); + Refresh(); } // ---------------------------------------------------------------------------- @@ -1532,7 +1635,7 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event) void wxCalendarCtrl::OnChar(wxKeyEvent& event) { wxDateTime target; - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case _T('+'): case WXK_ADD: @@ -1677,7 +1780,7 @@ void wxCalendarCtrl::SetHoliday(size_t day) attr = new wxCalendarDateAttr; } - attr->SetHoliday(TRUE); + attr->SetHoliday(true); // can't use SetAttr() because it would delete this pointer m_attrs[day - 1] = attr; @@ -1689,26 +1792,18 @@ void wxCalendarCtrl::ResetHolidayAttrs() { if ( m_attrs[day] ) { - m_attrs[day]->SetHoliday(FALSE); + m_attrs[day]->SetHoliday(false); } } } -// ---------------------------------------------------------------------------- -// wxCalendarEvent -// ---------------------------------------------------------------------------- - -void wxCalendarEvent::Init() -{ - m_wday = wxDateTime::Inv_WeekDay; -} -wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) - : wxCommandEvent(type, cal->GetId()) +//static +wxVisualAttributes +wxCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant) { - m_date = cal->GetDate(); - SetEventObject(cal); + // Use the same color scheme as wxListBox + return wxListBox::GetClassDefaultAttributes(variant); } #endif // wxUSE_CALENDARCTRL -