Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / msw / calctrl.h

diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h
index 50df43095ed358c7a505943db926df0de4b40804..c5c51d9fdee1b0b7b66b5061fb6b3d02d0e15b69 100644 (file)
--- a/include/wx/msw/calctrl.h
+++ b/include/wx/msw/calctrl.h
@@ -2,7 +2,6 @@
 // Name:        wx/msw/calctrl.h
 // Purpose:     wxCalendarCtrl control implementation for MSW
 // Author:      Vadim Zeitlin
 // Name:        wx/msw/calctrl.h
 // Purpose:     wxCalendarCtrl control implementation for MSW
 // Author:      Vadim Zeitlin

-// RCS-ID:      $Id$

 // Copyright:   (C) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -45,6 +44,7 @@ public:
     virtual bool EnableMonthChange(bool enable = true);
 
     virtual void Mark(size_t day, bool mark);
     virtual bool EnableMonthChange(bool enable = true);
 
     virtual void Mark(size_t day, bool mark);

+    virtual void SetHoliday(size_t day);

 
     virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
                                             wxDateTime *date = NULL,
 
     virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
                                             wxDateTime *date = NULL,


@@ -53,7 +53,7 @@ public:
     virtual void SetWindowStyleFlag(long style);
 
 protected:
     virtual void SetWindowStyleFlag(long style);
 
 protected:

-    virtual wxSize wxCalendarCtrl::DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const;

 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 


@@ -63,7 +63,7 @@ protected:
     void MSWOnDoubleClick(wxMouseEvent& event);
 
 private:
     void MSWOnDoubleClick(wxMouseEvent& event);
 
 private:

-    void Init() { m_marks = 0; }
+    void Init();

 
     // bring the control in sync with m_marks
     void UpdateMarks();
 
     // bring the control in sync with m_marks
     void UpdateMarks();


@@ -72,6 +72,12 @@ private:
     // wxCAL_MONDAY_FIRST flag
     void UpdateFirstDayOfWeek();
 
     // wxCAL_MONDAY_FIRST flag
     void UpdateFirstDayOfWeek();
 

+    // reset holiday information
+    virtual void ResetHolidayAttrs() { m_holidays = 0; }
+
+    // redisplay holidays
+    virtual void RefreshHolidays() { UpdateMarks(); }
+

 
     // current date, we need to store it instead of simply retrieving it from
     // the control as needed in order to be able to generate the correct events
 
     // current date, we need to store it instead of simply retrieving it from
     // the control as needed in order to be able to generate the correct events


@@ -81,9 +87,12 @@ private:
     // bit field containing the state (marked or not) of all days in the month
     wxUint32 m_marks;
 
     // bit field containing the state (marked or not) of all days in the month
     wxUint32 m_marks;
 

+    // the same but indicating whether a day is a holiday or not
+    wxUint32 m_holidays;
+

 
     DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
 
     DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)

-    DECLARE_NO_COPY_CLASS(wxCalendarCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxCalendarCtrl);

 };
 
 #endif // _WX_MSW_CALCTRL_H_
 };
 
 #endif // _WX_MSW_CALCTRL_H_