bracket unused function

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

diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h
index fb85631c50058fcf6256fe6284afb53f82a0da58..02abe012107b098ecbd06b05aa3eb90ee64a95b9 100644 (file)
--- a/include/wx/generic/calctrlg.h
+++ b/include/wx/generic/calctrlg.h
@@ -125,14 +125,14 @@ public:
 
     virtual wxCalendarDateAttr *GetAttr(size_t day) const
     {
 
     virtual wxCalendarDateAttr *GetAttr(size_t day) const
     {

-        wxCHECK_MSG( day > 0 && day < 32, NULL, _T("invalid day") );
+        wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") );

 
         return m_attrs[day - 1];
     }
 
     virtual void SetAttr(size_t day, wxCalendarDateAttr *attr)
     {
 
         return m_attrs[day - 1];
     }
 
     virtual void SetAttr(size_t day, wxCalendarDateAttr *attr)
     {

-        wxCHECK_RET( day > 0 && day < 32, _T("invalid day") );
+        wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") );

 
         delete m_attrs[day - 1];
         m_attrs[day - 1] = attr;
 
         delete m_attrs[day - 1];
         m_attrs[day - 1] = attr;


@@ -199,15 +199,29 @@ private:
     // get the date from which we start drawing days
     wxDateTime GetStartDate() const;
 
     // get the date from which we start drawing days
     wxDateTime GetStartDate() const;
 

+    // get the first/last days of the week corresponding to the current style
+    wxDateTime::WeekDay GetWeekStart() const
+    {
+        return HasFlag(wxCAL_MONDAY_FIRST) ? wxDateTime::Mon
+                                           : wxDateTime::Sun;
+    }
+
+    wxDateTime::WeekDay GetWeekEnd() const
+    {
+        return HasFlag(wxCAL_MONDAY_FIRST) ? wxDateTime::Sun
+                                           : wxDateTime::Sat;
+    }
+
+

     // is this date shown?
     bool IsDateShown(const wxDateTime& date) const;
 
     // is this date shown?
     bool IsDateShown(const wxDateTime& date) const;
 

-    // is this date in the given range?
+    // is this date in the currently allowed range?

     bool IsDateInRange(const wxDateTime& date) const;
 
     bool IsDateInRange(const wxDateTime& date) const;
 

-    // range helpers
-    bool ChangeYear(wxDateTime* target) const;
-    bool ChangeMonth(wxDateTime* target) const;
+    // adjust the date to the currently allowed range, return true if it was
+    // changed
+    bool AdjustDateToRange(wxDateTime *date) const;

 
     // redraw the given date
     void RefreshDate(const wxDateTime& date);
 
     // redraw the given date
     void RefreshDate(const wxDateTime& date);


@@ -282,7 +296,8 @@ private:
     // the width and height of one column/row in the calendar
     wxCoord m_widthCol,
             m_heightRow,
     // the width and height of one column/row in the calendar
     wxCoord m_widthCol,
             m_heightRow,

-            m_rowOffset;
+            m_rowOffset,
+            m_calendarWeekWidth;

 
     wxRect m_leftArrowRect,
            m_rightArrowRect;
 
     wxRect m_leftArrowRect,
            m_rightArrowRect;


@@ -296,7 +311,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxGenericCalendarCtrl)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGenericCalendarCtrl)
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl);

 };
 
 #endif // _WX_GENERIC_CALCTRLG_H
 };
 
 #endif // _WX_GENERIC_CALCTRLG_H