Applied modified 3-state checkbox patch from Mathew Cucuzella

[wxWidgets.git] / include / wx / datetime.h

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 21e98adb728b0095050091aa4dc4fd257eaffecd..6e45b0fcd4b9281eb6a156073a3d24cb051180bb 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DATETIME_H
 #define _WX_DATETIME_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "datetime.h"
 #endif
 
@@ -21,7 +21,12 @@
 
 #if wxUSE_DATETIME
 
+#ifndef __WXWINCE__
 #include <time.h>
+#else
+#include "wx/msw/wince/time.h"
+#endif
+
 #include <limits.h>             // for INT_MIN
 
 #include "wx/longlong.h"
@@ -323,6 +328,12 @@ public:
         // day or not
         //
         // TODO move this to intl.h
+
+// Required for WinCE
+#ifdef USA
+#undef USA
+#endif
+
     enum Country
     {
         Country_Unknown, // no special information for this country
@@ -342,10 +353,8 @@ public:
         Country_WesternEurope_End = UK,
 
         Russia,
-
         USA
     };
-
         // symbolic names for the months
     enum Month
     {
@@ -1283,7 +1292,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray, WXDLLIMPEXP_BASE)
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxDateTimeHolidayAuthority;
-WX_DEFINE_USER_EXPORTED_ARRAY(wxDateTimeHolidayAuthority *,
+WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxDateTimeHolidayAuthority *,
                               wxHolidayAuthoritiesArray,
                               class WXDLLIMPEXP_BASE);
 
@@ -1481,8 +1490,9 @@ inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday,
     return SetToWeekDay(weekday, -1, month, year);
 }
 
-inline wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday,
-                                                   WeekFlags flags) const
+inline wxDateTime
+wxDateTime::GetWeekDayInSameWeek(WeekDay weekday,
+                                 WeekFlags WXUNUSED(flags)) const
 {
     MODIFY_AND_RETURN( SetToWeekDayInSameWeek(weekday) );
 }