Remove wxUSE_WCHAR_T checks.

[wxWidgets.git] / interface / wx / calctrl.h

diff --git a/interface/wx/calctrl.h b/interface/wx/calctrl.h
index 11a09e7fa01b436f1e5853be8ed1753db744eadb..7f6533cea8792457b13add4b7e4e17ce98cd4f0a 100644 (file)
--- a/interface/wx/calctrl.h
+++ b/interface/wx/calctrl.h
@@ -53,7 +53,7 @@ enum wxCalendarDateBorder
     of this class are used with wxCalendarCtrl.
 
     @library{wxadv}
     of this class are used with wxCalendarCtrl.
 
     @library{wxadv}

-    @category{misc}
+    @category{data}

 
     @see wxCalendarCtrl
 */
 
     @see wxCalendarCtrl
 */


@@ -182,7 +182,11 @@ enum wxCalendarHitTestResult
 {
     wxCAL_HITTEST_NOWHERE,  ///< Hit outside of anything.
     wxCAL_HITTEST_HEADER,   ///< Hit on the header (weekdays).
 {
     wxCAL_HITTEST_NOWHERE,  ///< Hit outside of anything.
     wxCAL_HITTEST_HEADER,   ///< Hit on the header (weekdays).

-    wxCAL_HITTEST_DAY       ///< Hit on a day in the calendar.
+    wxCAL_HITTEST_DAY,      ///< Hit on a day in the calendar.
+    wxCAL_HITTEST_INCMONTH, ///< Hit on next month arrow (in alternate month selector mode).
+    wxCAL_HITTEST_DECMONTH, ///< Hit on previous month arrow (in alternate month selector mode).
+    wxCAL_HITTEST_SURROUNDING_WEEK, ///< Hit on surrounding week of previous/next month (if shown).
+    wxCAL_HITTEST_WEEK      ///< Hit on week of the year number (if shown).

 };
 
 /**
 };
 
 /**


@@ -233,7 +237,7 @@ enum wxCalendarHitTestResult
            Show week numbers on the left side of the calendar. (not in generic)
     @endStyleTable
 
            Show week numbers on the left side of the calendar. (not in generic)
     @endStyleTable
 

-    @beginEventTable{wxCalendarEvent}
+    @beginEventEmissionTable{wxCalendarEvent}

     @event{EVT_CALENDAR(id, func)}
            A day was double clicked in the calendar.
     @event{EVT_CALENDAR_SEL_CHANGED(id, func)}
     @event{EVT_CALENDAR(id, func)}
            A day was double clicked in the calendar.
     @event{EVT_CALENDAR_SEL_CHANGED(id, func)}


@@ -242,6 +246,8 @@ enum wxCalendarHitTestResult
            The selected month (and/or year) changed.
     @event{EVT_CALENDAR_WEEKDAY_CLICKED(id, func)}
            User clicked on the week day header (only generic).
            The selected month (and/or year) changed.
     @event{EVT_CALENDAR_WEEKDAY_CLICKED(id, func)}
            User clicked on the week day header (only generic).

+    @event{EVT_CALENDAR_WEEK_CLICKED(id, func)}
+           User clicked on the week of the year number (only generic).

     @endEventTable
 
     @note Changing the selected date will trigger an EVT_CALENDAR_DAY, MONTH or
     @endEventTable
 
     @note Changing the selected date will trigger an EVT_CALENDAR_DAY, MONTH or


@@ -487,10 +493,10 @@ public:
 
         @param lowerdate
             The low limit for the dates shown by the control or
 
         @param lowerdate
             The low limit for the dates shown by the control or

-            @c wxDefaultDateTime.
+            ::wxDefaultDateTime.

         @param upperdate
             The high limit for the dates shown by the control or
         @param upperdate
             The high limit for the dates shown by the control or

-            @c wxDefaultDateTime.
+            ::wxDefaultDateTime.

         @return
             @true if either limit is valid, @false otherwise
      */
         @return
             @true if either limit is valid, @false otherwise
      */


@@ -504,11 +510,11 @@ public:
 
         @param lowerdate
             If non-@NULL, the value of the low limit for the dates shown by the
 
         @param lowerdate
             If non-@NULL, the value of the low limit for the dates shown by the

-            control is returned (which may be @c wxDefaultDateTime if no limit
+            control is returned (which may be ::wxDefaultDateTime if no limit

             is set).
         @param upperdate
             If non-@NULL, the value of the upper limit for the dates shown by
             is set).
         @param upperdate
             If non-@NULL, the value of the upper limit for the dates shown by

-            the control is returned (which may be @c wxDefaultDateTime if no
+            the control is returned (which may be ::wxDefaultDateTime if no

             limit is set).
         @return
             @true if either limit is set, @false otherwise
             limit is set).
         @return
             @true if either limit is set, @false otherwise