[ 1936700 ] wxCAL_SHOW_WEEK_NUMBERS, slightly modified

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

diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h
index 253890e05614041cb2e70d6bd2819ffe923f7f4b..e4d3beabff8c31cb75ed89113ebbbd2415f289c8 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
     // ---------------------------------------------
 
-    // 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 SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
-                      const wxDateTime& upperdate = wxDefaultDateTime);
-
 
     // calendar mode
     // -------------
@@ -165,9 +168,6 @@ public:
 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:
@@ -253,6 +253,7 @@ private:
     // typed in by the user
     void SetUserChangedYear() { m_userChangedYear = true; }
 
+
     // the subcontrols
     wxStaticText *m_staticMonth;
     wxComboBox *m_comboMonth;
@@ -275,7 +276,7 @@ private:
              m_colHeaderFg,
              m_colHeaderBg,
              m_colBackground,
-             m_colSorrounding;
+             m_colSurrounding;
 
     // the attributes for each of the month days
     wxCalendarDateAttr *m_attrs[31];