fixed compilation if wxUSE_STL=1

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

diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h
index cb10d1019b5a0ea07e6e149f46a046572ecbec69..6bd3c754866f48c37d1073d7a0297cc651d88072 100644 (file)
--- a/include/wx/generic/calctrl.h
+++ b/include/wx/generic/calctrl.h
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "calctrl.h"
-#endif
-

 #ifndef _WX_GENERIC_CALCTRL_H
 #define _WX_GENERIC_CALCTRL_H
 
 #ifndef _WX_GENERIC_CALCTRL_H
 #define _WX_GENERIC_CALCTRL_H
 


@@ -31,9 +27,6 @@ class WXDLLEXPORT wxSpinCtrl;
 
 class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxControl
 {
 
 class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxControl
 {

-friend class wxMonthComboBox;
-friend class wxYearSpinCtrl;
-

 public:
     // construction
     wxCalendarCtrl() { Init(); }
 public:
     // construction
     wxCalendarCtrl() { Init(); }


@@ -162,16 +155,31 @@ public:
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
 
     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);
 
     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();
 
 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);
     // event handlers
     void OnPaint(wxPaintEvent& event);
     void OnClick(wxMouseEvent& event);


@@ -179,13 +187,7 @@ private:
     void OnChar(wxKeyEvent& event);
     void OnMonthChange(wxCommandEvent& event);
     void OnYearChange(wxCommandEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnMonthChange(wxCommandEvent& event);
     void OnYearChange(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);
+    void OnYearTextChange(wxCommandEvent& event);

 
     // (re)calc m_widthCol and m_heightRow
     void RecalcGeometry();
 
     // (re)calc m_widthCol and m_heightRow
     void RecalcGeometry();


@@ -248,6 +250,10 @@ private:
     // show the correct controls
     void ShowCurrentControls();
 
     // show the correct controls
     void ShowCurrentControls();
 

+    // create the month combo and year spin controls
+    void CreateMonthComboBox();
+    void CreateYearSpinCtrl();
+

 public:
     // get the currently shown control for month/year
     wxControl *GetMonthControl() const;
 public:
     // get the currently shown control for month/year
     wxControl *GetMonthControl() const;


@@ -257,7 +263,7 @@ private:
     // OnPaint helper-methods
 
     // Highlight the [fromdate : todate] range using pen and brush
     // 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)
 
     // 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)


@@ -288,7 +294,9 @@ private:
              m_colHolidayFg,
              m_colHolidayBg,
              m_colHeaderFg,
              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];
 
     // the attributes for each of the month days
     wxCalendarDateAttr *m_attrs[31];