From: Vadim Zeitlin Date: Sun, 29 Mar 2009 17:26:25 +0000 (+0000) Subject: use short date format in wxLOCALE_DATE_TIME_FMT handler for MSW for compatibility... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cd8a8b45b962b20ccb72ba05221a42685e423792 use short date format in wxLOCALE_DATE_TIME_FMT handler for MSW for compatibility with strftime("%c") git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/intl.cpp b/src/common/intl.cpp index b17ab7f2db..5b9c02b7f4 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -2849,8 +2849,12 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) case wxLOCALE_DATE_TIME_FMT: // there doesn't seem to be any specific setting for this, so just // combine date and time ones + // + // we use the short date because this is what "%c" uses by default + // ("%#c" uses long date but we have no way to specify the + // alternate representation here) { - const wxString datefmt = GetInfo(wxLOCALE_LONG_DATE_FMT); + const wxString datefmt = GetInfo(wxLOCALE_SHORT_DATE_FMT); if ( datefmt.empty() ) break;