X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab473127c64c9e20c3401bd8f0e173953c049d45..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/generic/calctrl.cpp?ds=sidebyside diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index 97481d564c..c6616b237c 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -33,7 +33,7 @@ #include "wx/settings.h" #include "wx/brush.h" #include "wx/combobox.h" - #include "wx/listbox" + #include "wx/listbox.h" #include "wx/stattext.h" #include "wx/textctrl.h" #endif //WX_PRECOMP @@ -200,10 +200,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); } @@ -312,7 +312,11 @@ bool wxCalendarCtrl::Create(wxWindow *parent, // 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;