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

Use wx prefix for global names

Browse Source
This commit is contained in:
Paul Cornett
2017-10-01 10:03:48 -07:00
parent 63a8a852f9
commit 37e29d3451
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/datetimefmt.cpp
View File

@@ -64,9 +64,9 @@
// helpers shared between datetime.cpp and datetimefmt.cpp
// ----------------------------------------------------------------------------
extern void InitTm(struct tm& tm);
extern void wxInitTm(struct tm& tm);
extern wxString CallStrftime(const wxString& format, const tm* tm);
extern wxString wxCallStrftime(const wxString& format, const tm* tm);
// ----------------------------------------------------------------------------
// constants (see also datetime.cpp)
@@ -402,7 +402,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
if ( tm )
{
return CallStrftime(format, tm);
return wxCallStrftime(format, tm);
}
}
//else: use generic code below
@@ -566,7 +566,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
// corresponding to Feb 29 of a non leap year (which
// may happen if yearReal was leap and year is not)
struct tm tmAdjusted;
InitTm(tmAdjusted);
wxInitTm(tmAdjusted);
tmAdjusted.tm_hour = tm.hour;
tmAdjusted.tm_min = tm.min;
tmAdjusted.tm_sec = tm.sec;
@@ -576,7 +576,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
tmAdjusted.tm_mon = tm.mon;
tmAdjusted.tm_year = year - 1900;
tmAdjusted.tm_isdst = 0; // no DST, already adjusted
wxString str = CallStrftime(*p == wxT('c') ? wxT("%c")
wxString str = wxCallStrftime(*p == wxT('c') ? wxT("%c")
: wxT("%x"),
&tmAdjusted);
@@ -650,7 +650,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
case wxT('p'): // AM or PM string
#ifdef wxHAS_STRFTIME
res += CallStrftime(wxT("%p"), &tmTimeOnly);
res += wxCallStrftime(wxS("%p"), &tmTimeOnly);
#else // !wxHAS_STRFTIME
res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
@@ -678,7 +678,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
case wxT('X'): // locale default time representation
// just use strftime() to format the time for us
#ifdef wxHAS_STRFTIME
res += CallStrftime(wxT("%X"), &tmTimeOnly);
res += wxCallStrftime(wxS("%X"), &tmTimeOnly);
#else // !wxHAS_STRFTIME
res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);
#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
@@ -722,7 +722,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
case wxT('Z'): // timezone name
#ifdef wxHAS_STRFTIME
res += CallStrftime(wxT("%Z"), &tmTimeOnly);
res += wxCallStrftime(wxS("%Z"), &tmTimeOnly);
#endif
break;