X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e9670446ab3bb894f2898167d7fd070af98fcaf..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/datetime.h diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 463d6602d3..6e45b0fcd4 100644 --- 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 @@ -1292,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); @@ -1490,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) ); }