wxDC::StretchBlit() for wxMac and wxMSW (patch 1611973)

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

diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h
index 21a6bb95e8d49c313194b1e9fcaafdb18321157f..6bd3c754866f48c37d1073d7a0297cc651d88072 100644 (file)
--- a/include/wx/generic/calctrl.h
+++ b/include/wx/generic/calctrl.h
@@ -155,16 +155,31 @@ public:
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
 
+    virtual void SetWindowStyleFlag(long style);
+
     virtual wxVisualAttributes GetDefaultAttributes() const
         { return GetClassDefaultAttributes(GetWindowVariant()); }
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
+
+protected:
+    // override some base class virtuals
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoGetPosition(int *x, int *y) const;
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+
 private:
     // common part of all ctors
     void Init();
 
+    // startup colours and reinitialization after colour changes in system
+    void InitColours();
+
     // event handlers
     void OnPaint(wxPaintEvent& event);
     void OnClick(wxMouseEvent& event);
@@ -174,13 +189,6 @@ private:
     void OnYearChange(wxCommandEvent& event);
     void OnYearTextChange(wxCommandEvent& event);
 
-    // override some base class virtuals
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
     // (re)calc m_widthCol and m_heightRow
     void RecalcGeometry();
 
@@ -255,7 +263,7 @@ private:
     // 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);
+    void HighlightRange(wxPaintDC* dc, const wxDateTime& fromdate, const wxDateTime& todate, const wxPen* pen, const 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)
@@ -286,7 +294,9 @@ private:
              m_colHolidayFg,
              m_colHolidayBg,
              m_colHeaderFg,
-             m_colHeaderBg;
+             m_colHeaderBg,
+             m_colBackground,
+             m_colSorrounding;
 
     // the attributes for each of the month days
     wxCalendarDateAttr *m_attrs[31];