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

build fix for systems where HAVE_STRPTIME is defined

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-03-20 21:00:15 +00:00
parent c4e085608a
commit cac1cfce37
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/common/datetimefmt.cpp
View File

@@ -1183,7 +1183,7 @@ wxDateTime::ParseFormat(const wxString& date,
case _T('c'): // locale default date and time representation case _T('c'): // locale default date and time representation
{ {
wxDateTime dt; wxDateTime dt;
Tm tm; tm tm;
const wxString inc(input); const wxString inc(input);
@@ -1194,7 +1194,22 @@ wxDateTime::ParseFormat(const wxString& date,
// to our generic code anyhow // to our generic code anyhow
const wxStringCharType * const wxStringCharType *
result = CallStrptime(input, "%c", &tm); result = CallStrptime(input, "%c", &tm);
if ( !result ) if ( result )
{
haveDay = haveMon = haveYear =
haveHour = haveMin = haveSec = true;
hour = tm.tm_hour;
min = tm.tm_min;
sec = tm.tm_sec;
year = 1900 + tm.tm_year;
mon = (Month)tm.tm_mon;
mday = tm.tm_mday;
input = result; // proceed where strptime() ended
}
else
{ {
// strptime() failed; try generic heuristic code // strptime() failed; try generic heuristic code
#endif // HAVE_STRPTIME #endif // HAVE_STRPTIME
@@ -1209,24 +1224,23 @@ wxDateTime::ParseFormat(const wxString& date,
return NULL; return NULL;
} }
tm = dt.GetTm(); Tm tm = dt.GetTm();
haveDay = haveMon = haveYear =
haveHour = haveMin = haveSec = true;
hour = tm.hour;
min = tm.min;
sec = tm.sec;
year = tm.year;
mon = tm.mon;
mday = tm.mday;
input += endc - inc.begin(); input += endc - inc.begin();
#ifdef HAVE_STRPTIME #ifdef HAVE_STRPTIME
} }
else
input = result; // proceed where strptime() ended
#endif // HAVE_STRPTIME #endif // HAVE_STRPTIME
haveDay = haveMon = haveYear =
haveHour = haveMin = haveSec = true;
hour = tm.hour;
min = tm.min;
sec = tm.sec;
year = tm.year;
mon = tm.mon;
mday = tm.mday;
} }
break; break;