X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37df1f337058d50f5749797400a767cf6efa5db1..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/generic/calctrl.h?ds=sidebyside diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h index 1a7ca729ec..fdd9b4dd07 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 /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "calctrl.h" #endif @@ -17,11 +17,11 @@ #define _WX_GENERIC_CALCTRL_H #include "wx/control.h" // the base class - -#include "wx/spinctrl.h" // for wxSpinEvent +#include "wx/dcclient.h" // for wxPaintDC class WXDLLEXPORT wxComboBox; class WXDLLEXPORT wxStaticText; +class WXDLLEXPORT wxSpinCtrl; #define wxCalendarNameStr _T("CalendarCtrl") @@ -43,12 +43,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS, - const wxString& name = wxCalendarNameStr) - { - Init(); - - (void)Create(parent, id, date, pos, size, style, name); - } + const wxString& name = wxCalendarNameStr); bool Create(wxWindow *parent, wxWindowID id, @@ -60,6 +55,8 @@ public: virtual ~wxCalendarCtrl(); + virtual bool Destroy(); + // set/get the current date // ------------------------ @@ -75,7 +72,7 @@ public: const wxDateTime& GetUpperDateLimit() const { return m_highdate; } bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, const wxDateTime& upperdate = wxDefaultDateTime); - + // calendar mode // ------------- @@ -175,7 +172,7 @@ private: void OnDClick(wxMouseEvent& event); void OnChar(wxKeyEvent& event); void OnMonthChange(wxCommandEvent& event); - void OnYearChange(wxSpinEvent& event); + void OnYearChange(wxCommandEvent& event); // override some base class virtuals virtual wxSize DoGetBestSize() const; @@ -201,7 +198,7 @@ private: // is this date in the given range? bool IsDateInRange(const wxDateTime& date) const; - + // range helpers bool ChangeYear(wxDateTime* target) const; bool ChangeMonth(wxDateTime* target) const; @@ -250,10 +247,10 @@ private: wxControl *GetYearControl() const; // OnPaint helper-methods - + // Highlight the [fromdate : todate] range using pen and brush void HighlightRange(wxPaintDC* dc, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pen, wxBrush* brush); - + // Get the "coordinates" for the date relative to the month currently displayed. // using (day, week): upper left coord is (1, 1), lower right coord is (7, 6) // if the date isn't visible (-1, -1) is put in (day, week) and false is returned @@ -290,13 +287,18 @@ private: m_rowOffset; wxRect m_leftArrowRect, - m_rightArrowRect; + m_rightArrowRect; // the week day names wxString m_weekdays[7]; + // TRUE if SetDate() is being called as the result of changing the year in + // the year control + bool m_userChangedYear; + DECLARE_DYNAMIC_CLASS(wxCalendarCtrl) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxCalendarCtrl) }; #endif // _WX_GENERIC_CALCTRL_H