Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding a for am/pm and windows special character t

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-29 20:10:14 +00:00
parent 756b5a9818
commit 3e43b64782
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/intl.cpp
View File

@@ -2613,6 +2613,13 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
char chLast = '\0'; char chLast = '\0';
size_t lastCount = 0; size_t lastCount = 0;
const char* formatchars =
"dghHmMsSy"
#ifdef __WXMSW__
"t"
#endif
;
for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p ) for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p )
{ {
if ( p != fmt.end() ) if ( p != fmt.end() )
@@ -2624,7 +2631,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
} }
const wxUniChar ch = (*p).GetValue(); const wxUniChar ch = (*p).GetValue();
if ( ch.IsAscii() && strchr("dghHmMsSy", ch) ) if ( ch.IsAscii() && strchr(formatchars, ch) )
{ {
// these characters come in groups, start counting them // these characters come in groups, start counting them
chLast = ch; chLast = ch;
@@ -2758,6 +2765,23 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
wxASSERT_MSG( lastCount <= 2, "too many 'g's" ); wxASSERT_MSG( lastCount <= 2, "too many 'g's" );
break; break;
case 'a':
fmtWX += "%p";
break;
#ifdef __WXMSW__
case 't':
switch ( lastCount )
{
case 1: // t
case 2: // tt
fmtWX += "%p";
break;
default:
wxFAIL_MSG( "too many 't's" );
}
break;
#endif
default: default:
wxFAIL_MSG( "unreachable" ); wxFAIL_MSG( "unreachable" );
} }