use (new) safer GetTraitsIfExists() in wxMutexGuiEnter/Leave() to avoid crashing...

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

diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h
index d750d54728c7647ae664f9da35c94f79c24819e2..1b56830df805d3940ed6484f16dfc29b532d72da 100644 (file)
--- a/include/wx/msw/calctrl.h
+++ b/include/wx/msw/calctrl.h
@@ -50,20 +50,28 @@ public:
                                             wxDateTime *date = NULL,
                                             wxDateTime::WeekDay *wd = NULL);
 
+    virtual void SetWindowStyleFlag(long style);
+
 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);
 
+    void MSWOnClick(wxMouseEvent& event);
     void MSWOnDoubleClick(wxMouseEvent& event);
 
 private:
     void Init() { m_marks = 0; }
 
+    // bring the control in sync with m_marks
     void UpdateMarks();
 
+    // set first day of week in the control to correspond to our
+    // wxCAL_MONDAY_FIRST flag
+    void UpdateFirstDayOfWeek();
+
 
     // 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