Replace wxControlContainer-related macros with wxNavigationEnabled<>.

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

diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h
index d750d54728c7647ae664f9da35c94f79c24819e2..28384e212f440efe57d364adb497a313fe702ed3 100644 (file)
--- a/include/wx/msw/calctrl.h
+++ b/include/wx/msw/calctrl.h
@@ -45,25 +45,40 @@ 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,
                                             wxDateTime::WeekDay *wd = NULL);
 
 
     virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
                                             wxDateTime *date = NULL,
                                             wxDateTime::WeekDay *wd = NULL);
 

+    virtual void SetWindowStyleFlag(long style);
+

 protected:
 protected:

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

 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 

+    void MSWOnClick(wxMouseEvent& event);

     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();
 
     void UpdateMarks();
 

+    // set first day of week in the control to correspond to our
+    // 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


@@ -73,9 +88,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_