X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..a97cefbabff29c566c0859d3e735c79a6f3032b6:/src/generic/calctrl.cpp diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index 1f6cacf0d5..0fe9ad1833 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -33,6 +33,7 @@ #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 @@ -41,6 +42,12 @@ #include "wx/spinctrl.h" +// 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 + #include "wx/calctrl.h" #define DEBUG_PAINT 0 @@ -161,7 +168,7 @@ wxCONSTRUCTOR_6( wxCalendarCtrl , wxWindow* , Parent , wxWindowID , Id , wxDateT #else IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl) #endif -IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent) +IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent) // ---------------------------------------------------------------------------- // events @@ -199,10 +206,10 @@ wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal) } SetSelection(m_cal->GetDate().GetMonth()); - SetSize(wxDefaultPosition.x, - wxDefaultPosition.y, - wxDefaultSize.x, - wxDefaultSize.y, + SetSize(wxDefaultCoord, + wxDefaultCoord, + wxDefaultCoord, + wxDefaultCoord, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); } @@ -306,28 +313,15 @@ bool wxCalendarCtrl::Create(wxWindow *parent, ShowCurrentControls(); - wxSize sizeReal; - if ( size.x == wxDefaultSize.x || size.y == wxDefaultSize.y ) - { - sizeReal = DoGetBestSize(); - if ( size.x != wxDefaultSize.x ) - sizeReal.x = size.x; - if ( size.y != wxDefaultSize.y ) - sizeReal.y = size.y; - } - else - { - sizeReal = size; - } - // 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 - SetSize(pos.x, pos.y, sizeReal.x, sizeReal.y); + SetBestSize(size); + SetPosition(pos); - SetForegroundColour(*wxBLACK); - SetBackgroundColour(*wxWHITE); - SetFont(*wxSWISS_FONT); + // Since we don't paint the whole background make sure that the platform + // will use the right one. + SetBackgroundColour(GetBackgroundColour()); SetHolidayAttrs(); @@ -805,7 +799,9 @@ wxSize wxCalendarCtrl::DoGetBestSize() const width += 4; } - return wxSize(width, height); + wxSize best(width, height); + CacheBestSize(best); + return best; } void wxCalendarCtrl::DoSetSize(int x, int y, @@ -825,37 +821,6 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height) 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); @@ -863,7 +828,7 @@ Otto Wyss m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y); m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y); -#endif + yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN; } else // no controls on the top @@ -904,12 +869,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) @@ -940,7 +902,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - dc.SetFont(m_font); + dc.SetFont(GetFont()); RecalcGeometry(); @@ -982,7 +944,7 @@ 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); @@ -991,8 +953,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) 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); + m_leftArrowRect = m_rightArrowRect = wxRect(0,0,0,0); if ( AllowMonthChange() ) { @@ -1158,7 +1119,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) } else { - colBorder = m_foregroundColour; + colBorder = GetForegroundColour(); } wxPen pen(colBorder, 1, wxSOLID); @@ -1184,13 +1145,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 @@ -1824,20 +1785,13 @@ void wxCalendarCtrl::ResetHolidayAttrs() } } -// ---------------------------------------------------------------------------- -// 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