adjusting DATE_TIME_FMT on OS X

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp
index 37c405490be4d4fc4f83017a259bf71838671350..a63739d3e417e6e2a9ba91d098e4a6b9cdf0be81 100644 (file)
--- a/tests/intl/intltest.cpp
+++ b/tests/intl/intltest.cpp
@@ -158,7 +158,11 @@ void IntlTestCase::DateTimeFmtFrench()
 #else
     static const char *FRENCH_DATE_FMT = "%d/%m/%Y";
     static const char *FRENCH_LONG_DATE_FMT = "%A %d %B %Y";
 #else
     static const char *FRENCH_DATE_FMT = "%d/%m/%Y";
     static const char *FRENCH_LONG_DATE_FMT = "%A %d %B %Y";

+#ifdef __WXOSX__
+    static const char *FRENCH_DATE_TIME_FMT = "%A %d %B %Y %H:%M:%S";
+#else

     static const char *FRENCH_DATE_TIME_FMT = "%d/%m/%Y %H:%M:%S";
     static const char *FRENCH_DATE_TIME_FMT = "%d/%m/%Y %H:%M:%S";

+#endif

 #endif
 
     CompareFormats( "French short date", FRENCH_DATE_FMT,
 #endif
 
     CompareFormats( "French short date", FRENCH_DATE_FMT,


@@ -181,7 +185,11 @@ void IntlTestCase::DateTimeFmtC()
 #else
     static const char *C_DATE_FMT = "%d/%m/%Y";
     static const char *C_LONG_DATE_FMT = "%A %d %B %Y";
 #else
     static const char *C_DATE_FMT = "%d/%m/%Y";
     static const char *C_LONG_DATE_FMT = "%A %d %B %Y";

+#ifdef __WXOSX__
+    static const char *C_DATE_TIME_FMT = "%A %d %B %Y %H:%M:%S";
+#else

     static const char *C_DATE_TIME_FMT = "%d/%m/%Y %H:%M:%S";
     static const char *C_DATE_TIME_FMT = "%d/%m/%Y %H:%M:%S";

+#endif

 #endif
 
     setlocale(LC_ALL, "C");
 #endif
 
     setlocale(LC_ALL, "C");