X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..0fab3a5a1a0729cb417c05d50712bd9083b02801:/include/wx/generic/calctrl.h?ds=sidebyside diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h index 879ddcda07..f7d3d6abbc 100644 --- a/include/wx/generic/calctrl.h +++ b/include/wx/generic/calctrl.h @@ -6,10 +6,10 @@ // Created: 29.12.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "calctrl.h" #endif @@ -29,7 +29,7 @@ class WXDLLEXPORT wxSpinCtrl; // wxCalendarCtrl: a control allowing the user to pick a date interactively // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCalendarCtrl : public wxControl +class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxControl { friend class wxMonthComboBox; friend class wxYearSpinCtrl; @@ -242,10 +242,12 @@ private: // show the correct controls void ShowCurrentControls(); +public: // get the currently shown control for month/year wxControl *GetMonthControl() const; wxControl *GetYearControl() const; +private: // OnPaint helper-methods // Highlight the [fromdate : todate] range using pen and brush @@ -256,6 +258,10 @@ private: // if the date isn't visible (-1, -1) is put in (day, week) and false is returned bool GetDateCoord(const wxDateTime& date, int *day, int *week) const; + // Set the flag for SetDate(): otherwise it would overwrite the year + // typed in by the user + void SetUserChangedYear() { m_userChangedYear = TRUE; } + // the subcontrols wxStaticText *m_staticMonth; wxComboBox *m_comboMonth; @@ -298,6 +304,7 @@ private: DECLARE_DYNAMIC_CLASS(wxCalendarCtrl) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxCalendarCtrl) }; #endif // _WX_GENERIC_CALCTRL_H