Minor corrections to make dist after reports

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

diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h
index 253890e05614041cb2e70d6bd2819ffe923f7f4b..7cdc50d2b406be9d1e7178ffef6ee1c55f34c463 100644 (file)
--- a/include/wx/generic/calctrlg.h
+++ b/include/wx/generic/calctrlg.h
@@ -58,15 +58,18 @@ public:
     // set/get the range in which selection can occur
     // ---------------------------------------------
 
     // set/get the range in which selection can occur
     // ---------------------------------------------
 

-    // all functions in this section are for generic version only
+    virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
+                              const wxDateTime& upperdate = wxDefaultDateTime);
+
+    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const;
+
+    // these functions are for generic version only, don't use them but use the
+    // Set/GetDateRange() above instead

     bool SetLowerDateLimit(const wxDateTime& date = wxDefaultDateTime);
     const wxDateTime& GetLowerDateLimit() const { return m_lowdate; }
     bool SetUpperDateLimit(const wxDateTime& date = wxDefaultDateTime);
     const wxDateTime& GetUpperDateLimit() const { return m_highdate; }
 
     bool SetLowerDateLimit(const wxDateTime& date = wxDefaultDateTime);
     const wxDateTime& GetLowerDateLimit() const { return m_lowdate; }
     bool SetUpperDateLimit(const wxDateTime& date = wxDefaultDateTime);
     const wxDateTime& GetUpperDateLimit() const { return m_highdate; }
 

-    bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
-                      const wxDateTime& upperdate = wxDefaultDateTime);
-

 
     // calendar mode
     // -------------
 
     // calendar mode
     // -------------


@@ -81,9 +84,6 @@ public:
     // corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only
     void EnableYearChange(bool enable = true);
 
     // corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only
     void EnableYearChange(bool enable = true);
 

-    // corresponds to wxCAL_SHOW_HOLIDAYS bit, generic only
-    virtual void EnableHolidayDisplay(bool display = true);
-

 
     // customization
     // -------------
 
     // customization
     // -------------


@@ -165,10 +165,8 @@ public:
 protected:
     // override some base class virtuals
     virtual wxSize DoGetBestSize() const;
 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);
     virtual void DoMoveWindow(int x, int y, int width, int height);

+    virtual void DoGetSize(int *width, int *height) const;

 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors


@@ -214,12 +212,6 @@ private:
     // change the date inside the same month/year
     void ChangeDay(const wxDateTime& date);
 
     // change the date inside the same month/year
     void ChangeDay(const wxDateTime& date);
 

-    // set the attributes for the holidays if needed
-    void SetHolidayAttrs();
-
-    // reset all holidays
-    void ResetHolidayAttrs();
-

     // deprecated
     bool AllowYearChange() const
     {
     // deprecated
     bool AllowYearChange() const
     {


@@ -239,6 +231,9 @@ public:
     wxControl *GetYearControl() const;
 
 private:
     wxControl *GetYearControl() const;
 
 private:

+    virtual void ResetHolidayAttrs();
+    virtual void RefreshHolidays() { Refresh(); }
+

     // OnPaint helper-methods
 
     // Highlight the [fromdate : todate] range using pen and brush
     // OnPaint helper-methods
 
     // Highlight the [fromdate : todate] range using pen and brush


@@ -253,6 +248,7 @@ private:
     // typed in by the user
     void SetUserChangedYear() { m_userChangedYear = true; }
 
     // typed in by the user
     void SetUserChangedYear() { m_userChangedYear = true; }
 

+

     // the subcontrols
     wxStaticText *m_staticMonth;
     wxComboBox *m_comboMonth;
     // the subcontrols
     wxStaticText *m_staticMonth;
     wxComboBox *m_comboMonth;


@@ -275,7 +271,7 @@ private:
              m_colHeaderFg,
              m_colHeaderBg,
              m_colBackground,
              m_colHeaderFg,
              m_colHeaderBg,
              m_colBackground,

-             m_colSorrounding;
+             m_colSurrounding;

 
     // the attributes for each of the month days
     wxCalendarDateAttr *m_attrs[31];
 
     // the attributes for each of the month days
     wxCalendarDateAttr *m_attrs[31];