X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37df1f337058d50f5749797400a767cf6efa5db1..5b952139e838585734114dd147f7747d6084a0af:/src/generic/calctrl.cpp?ds=inline diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index ef305edb4c..c6616b237c 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -6,7 +6,7 @@ // Created: 29.12.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "calctrl.h" #endif @@ -33,11 +33,15 @@ #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/spinctrl.h" + #include "wx/calctrl.h" #define DEBUG_PAINT 0 @@ -57,6 +61,7 @@ private: wxCalendarCtrl *m_cal; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxMonthComboBox) }; class wxYearSpinCtrl : public wxSpinCtrl @@ -64,12 +69,18 @@ class wxYearSpinCtrl : public wxSpinCtrl public: wxYearSpinCtrl(wxCalendarCtrl *cal); + void OnYearTextChange(wxCommandEvent& event) + { + m_cal->SetUserChangedYear(); + m_cal->OnYearChange(event); + } void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); } private: wxCalendarCtrl *m_cal; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxYearSpinCtrl) }; // ---------------------------------------------------------------------------- @@ -86,14 +97,71 @@ BEGIN_EVENT_TABLE(wxCalendarCtrl, wxControl) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox) - EVT_COMBOBOX(-1, wxMonthComboBox::OnMonthChange) + EVT_COMBOBOX(wxID_ANY, wxMonthComboBox::OnMonthChange) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl) - EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange) + EVT_TEXT(wxID_ANY, wxYearSpinCtrl::OnYearTextChange) + EVT_SPINCTRL(wxID_ANY, wxYearSpinCtrl::OnYearChange) 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) +#endif IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent) // ---------------------------------------------------------------------------- @@ -116,12 +184,12 @@ DEFINE_EVENT_TYPE(wxEVT_CALENDAR_WEEKDAY_CLICKED) // ---------------------------------------------------------------------------- wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal) - : wxComboBox(cal->GetParent(), -1, + : wxComboBox(cal->GetParent(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, - wxCB_READONLY) + wxCB_READONLY | wxCLIP_SIBLINGS) { m_cal = cal; @@ -132,16 +200,21 @@ wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal) } SetSelection(m_cal->GetDate().GetMonth()); - SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); + SetSize(wxDefaultCoord, + wxDefaultCoord, + wxDefaultCoord, + wxDefaultCoord, + wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); } wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal) - : wxSpinCtrl(cal->GetParent(), -1, + : wxSpinCtrl(cal->GetParent(), wxID_ANY, cal->GetDate().Format(_T("%Y")), wxDefaultPosition, wxDefaultSize, - wxSP_ARROW_KEYS, + wxSP_ARROW_KEYS | wxCLIP_SIBLINGS, -4300, 10000, cal->GetDate().GetYear()) + { m_cal = cal; } @@ -150,10 +223,27 @@ wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal) // wxCalendarCtrl // ---------------------------------------------------------------------------- +wxCalendarCtrl::wxCalendarCtrl(wxWindow *parent, + wxWindowID id, + const wxDateTime& date, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + Init(); + + (void)Create(parent, id, date, pos, size, style, name); +} + void wxCalendarCtrl::Init() { m_comboMonth = NULL; m_spinYear = NULL; + m_staticYear = NULL; + m_staticMonth = NULL; + + m_userChangedYear = false; m_widthCol = m_heightRow = 0; @@ -169,9 +259,8 @@ void wxCalendarCtrl::Init() m_attrs[n] = NULL; } - wxSystemSettings ss; - m_colHighlightFg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - m_colHighlightBg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); m_colHolidayFg = *wxRED; // don't set m_colHolidayBg - by default, same as our bg colour @@ -189,9 +278,10 @@ bool wxCalendarCtrl::Create(wxWindow *parent, const wxString& name) { if ( !wxControl::Create(parent, id, pos, size, - style | wxWANTS_CHARS, wxDefaultValidator, name) ) + style | wxCLIP_CHILDREN | wxWANTS_CHARS, + wxDefaultValidator, name) ) { - return FALSE; + return false; } // needed to get the arrow keys normally used for the dialog navigation @@ -202,43 +292,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")), + 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")), + 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); - - SetBackgroundColour(*wxWHITE); - SetFont(*wxSWISS_FONT); + // 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); + // Since we don't paint the whole background make sure that the platform + // will use the right one. + SetBackgroundColour(GetBackgroundColour()); + SetHolidayAttrs(); - return TRUE; + return true; } wxCalendarCtrl::~wxCalendarCtrl() @@ -253,11 +334,30 @@ wxCalendarCtrl::~wxCalendarCtrl() // forward wxWin functions to subcontrols // ---------------------------------------------------------------------------- +bool wxCalendarCtrl::Destroy() +{ + if ( m_staticYear ) + m_staticYear->Destroy(); + if ( m_spinYear ) + m_spinYear->Destroy(); + if ( m_comboMonth ) + m_comboMonth->Destroy(); + if ( m_staticMonth ) + m_staticMonth->Destroy(); + + m_staticYear = NULL; + m_spinYear = NULL; + m_comboMonth = NULL; + m_staticMonth = NULL; + + return wxControl::Destroy(); +} + bool wxCalendarCtrl::Show(bool show) { if ( !wxControl::Show(show) ) { - return FALSE; + return false; } if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) @@ -269,14 +369,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) ) @@ -285,7 +385,7 @@ bool wxCalendarCtrl::Enable(bool enable) GetYearControl()->Enable(enable); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -294,7 +394,7 @@ bool wxCalendarCtrl::Enable(bool enable) void wxCalendarCtrl::ShowCurrentControls() { - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) + if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { if ( AllowMonthChange() ) { @@ -361,7 +461,7 @@ void wxCalendarCtrl::EnableMonthChange(bool enable) else style |= wxCAL_NO_MONTH_CHANGE; SetWindowStyle(style); - + ShowCurrentControls(); if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION ) { @@ -376,7 +476,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(); @@ -386,40 +486,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; + // change everything + m_date = date; - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - // update the controls - m_comboMonth->SetSelection(m_date.GetMonth()); - - 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; } @@ -514,7 +617,7 @@ bool wxCalendarCtrl::SetDateRange(const wxDateTime& lowerdate /* = wxDefaultDate { retval = false; } - + return retval; } @@ -552,17 +655,15 @@ 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 ) + return ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) ); - return retval; } bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const @@ -641,13 +742,13 @@ size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const // rewind back datetest.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST ? wxDateTime::Mon : wxDateTime::Sun); - + if ( datetest.GetDay() == 1 ) { retval += 1; } } - + return retval; } @@ -665,37 +766,36 @@ 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; } -// 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, @@ -707,27 +807,59 @@ 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; - +/* +In the calender the size of the combobox for the year +is just defined by a margin from the month combobox to +the left border. While in wxUniv the year control can't +show all 4 digits, in wxMsw it show almost twice as +much. Instead the year should use it's best size and be +left aligned to the calendar. Just in case the month in +any language is longer than it has space in the +calendar it is shortend.This way the year always can +show the 4 digits. + +This patch relies on the fact that a combobox has a +good best size implementation. This is not the case +with wxMSW but I don't know why. + +Otto Wyss +*/ + +#ifdef __WXUNIVERSAL__ + if (sizeCombo.x + HORZ_MARGIN - sizeSpin.x > width) + { + m_comboMonth->SetSize(x, y, width - HORZ_MARGIN - sizeSpin.x, sizeCombo.y); + } + else + { + m_comboMonth->Move(x, y); + } + m_staticMonth->Move(x, y + dy); + m_spinYear->Move(x + width - sizeSpin.x, y); + m_staticYear->Move(x + width - sizeSpin.x, y + dy); +#else 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(); +#endif yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN; } + else // no controls on the top + { + yDiff = 0; + } wxControl::DoMoveWindow(x, y + yDiff, width, height - yDiff); } @@ -753,7 +885,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; } @@ -762,12 +894,9 @@ 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) @@ -798,7 +927,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - dc.SetFont(m_font); + dc.SetFont(GetFont()); RecalcGeometry(); @@ -810,9 +939,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) wxCoord y = 0; -///////////////////////////////////////////////////////////////////////////////////////// - - if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) + if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) { // draw the sequential month-selector @@ -820,24 +947,24 @@ 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; - wxString headertext = m_date.Format("%B %Y"); + wxString headertext = m_date.Format(wxT("%B %Y")); dc.GetTextExtent(headertext, &monthw, &monthh); // draw month-name centered above weekdays wxCoord monthx = ((m_widthCol * 7) - monthw) / 2; wxCoord monthy = ((m_heightRow - monthh) / 2) + y; - dc.DrawText(headertext, monthx, monthy); + 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); @@ -882,8 +1009,6 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) y += m_heightRow; } -///////////////////////////////////////////////////////////////////////////////////////// - // first draw the week days if ( IsExposed(0, y, 7*m_widthCol, m_heightRow) ) { @@ -895,7 +1020,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.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++ ) @@ -907,7 +1032,6 @@ 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 } } @@ -949,8 +1073,8 @@ 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; wxCalendarDateAttr *attr = NULL; @@ -960,7 +1084,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) // surrounding week or out-of-range // draw "disabled" dc.SetTextForeground(*wxLIGHT_GREY); - changedColours = TRUE; + changedColours = true; } else { @@ -972,7 +1096,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetTextForeground(m_colHighlightFg); dc.SetTextBackground(m_colHighlightBg); - changedColours = TRUE; + changedColours = true; } else if ( attr ) { @@ -992,19 +1116,19 @@ 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; } } } @@ -1021,7 +1145,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) } else { - colBorder = m_foregroundColour; + colBorder = GetForegroundColour(); } wxPen pen(colBorder, 1, wxSOLID); @@ -1047,13 +1171,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 @@ -1080,7 +1204,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) if ( !IsDateInRange(date) ) { wxDateTime firstOOR = GetUpperDateLimit() + wxDateSpan::Day(); // first out-of-range - + wxBrush oorbrush = *wxLIGHT_GREY_BRUSH; oorbrush.SetStyle(wxFDIAGONAL_HATCH); @@ -1124,7 +1248,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) @@ -1141,7 +1265,7 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, { // do stuff // date-coordinates - int fd, fw; + int fd, fw; int td, tw; // implicit: both dates must be currently shown - checked by GetDateCoord @@ -1182,7 +1306,7 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, 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++; @@ -1199,7 +1323,7 @@ void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, } corners[cidx] = wxPoint(7 * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++; - + numpoints = cidx; } @@ -1227,17 +1351,17 @@ bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) c 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; + *day += ( startOnMonday ) ? 0 : 1; } int targetmonth = date.GetMonth() + (12 * date.GetYear()); @@ -1373,7 +1497,7 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos, if ( (GetWindowStyle() & 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? if ( wxRegion(m_leftArrowRect).Contains(pos) == wxInRegion ) @@ -1488,16 +1612,22 @@ 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); } - + wxDateTime target = wxDateTime(tm.mday, tm.mon, year); if ( ChangeYear(&target) ) @@ -1510,7 +1640,6 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event) // inside the same year but a strange number of months forward/back.. m_spinYear->SetValue(target.GetYear()); } - } // ---------------------------------------------------------------------------- @@ -1520,7 +1649,7 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event) void wxCalendarCtrl::OnChar(wxKeyEvent& event) { wxDateTime target; - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case _T('+'): case WXK_ADD: @@ -1665,7 +1794,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; @@ -1677,11 +1806,21 @@ void wxCalendarCtrl::ResetHolidayAttrs() { if ( m_attrs[day] ) { - m_attrs[day]->SetHoliday(FALSE); + m_attrs[day]->SetHoliday(false); } } } + +//static +wxVisualAttributes +wxCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant) +{ + // Use the same color scheme as wxListBox + return wxListBox::GetClassDefaultAttributes(variant); +} + + // ---------------------------------------------------------------------------- // wxCalendarEvent // ----------------------------------------------------------------------------