in debug mode when clicking with the middle mouse button draw borders around all...

[wxWidgets.git] / include / wx / generic / calctrlg.h

diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h
index 9d9d296c92c00532f8659956a492539fd584e52c..9ff4e89b54fcbbebede9e7fe246864c3acb5530a 100644 (file)
--- a/include/wx/generic/calctrlg.h
+++ b/include/wx/generic/calctrlg.h
@@ -18,6 +18,7 @@
 class WXDLLIMPEXP_FWD_CORE wxComboBox;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
 class WXDLLIMPEXP_FWD_CORE wxComboBox;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;

+class WXDLLIMPEXP_FWD_CORE wxSpinEvent;

 
 // ----------------------------------------------------------------------------
 // wxGenericCalendarCtrl
 
 // ----------------------------------------------------------------------------
 // wxGenericCalendarCtrl


@@ -84,9 +85,6 @@ public:
     // corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only
     void EnableYearChange(bool enable = true);
 
     // corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only
     void EnableYearChange(bool enable = true);
 

-    // corresponds to wxCAL_SHOW_HOLIDAYS bit, generic only
-    virtual void EnableHolidayDisplay(bool display = true);
-

 
     // customization
     // -------------
 
     // customization
     // -------------


@@ -184,7 +182,9 @@ private:
     void OnDClick(wxMouseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnMonthChange(wxCommandEvent& event);
     void OnDClick(wxMouseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnMonthChange(wxCommandEvent& event);

-    void OnYearChange(wxCommandEvent& event);
+
+    void HandleYearChange(wxCommandEvent& event);
+    void OnYearChange(wxSpinEvent& event);

     void OnYearTextChange(wxCommandEvent& event);
 
     // (re)calc m_widthCol and m_heightRow
     void OnYearTextChange(wxCommandEvent& event);
 
     // (re)calc m_widthCol and m_heightRow


@@ -215,12 +215,6 @@ private:
     // change the date inside the same month/year
     void ChangeDay(const wxDateTime& date);
 
     // change the date inside the same month/year
     void ChangeDay(const wxDateTime& date);
 

-    // set the attributes for the holidays if needed
-    void SetHolidayAttrs();
-
-    // reset all holidays
-    void ResetHolidayAttrs();
-

     // deprecated
     bool AllowYearChange() const
     {
     // deprecated
     bool AllowYearChange() const
     {


@@ -240,6 +234,9 @@ public:
     wxControl *GetYearControl() const;
 
 private:
     wxControl *GetYearControl() const;
 
 private:

+    virtual void ResetHolidayAttrs();
+    virtual void RefreshHolidays() { Refresh(); }
+

     // OnPaint helper-methods
 
     // Highlight the [fromdate : todate] range using pen and brush
     // OnPaint helper-methods
 
     // Highlight the [fromdate : todate] range using pen and brush


@@ -285,7 +282,8 @@ private:
     // the width and height of one column/row in the calendar
     wxCoord m_widthCol,
             m_heightRow,
     // the width and height of one column/row in the calendar
     wxCoord m_widthCol,
             m_heightRow,

-            m_rowOffset;
+            m_rowOffset,
+            m_calendarWeekWidth;

 
     wxRect m_leftArrowRect,
            m_rightArrowRect;
 
     wxRect m_leftArrowRect,
            m_rightArrowRect;