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

use wxString in wxDateTime methods (only partially done)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-12 18:41:27 +00:00
parent a007b626a7
commit 12e8247795
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/datetime.h
View File

@@ -1042,7 +1042,7 @@ public:
// default, they will not change if they had valid values or will // default, they will not change if they had valid values or will
// default to Today() otherwise) // default to Today() otherwise)
const wxChar *ParseFormat(const wxChar *date, const wxChar *ParseFormat(const wxChar *date,
const wxChar *format = wxDefaultDateTimeFormat, const wxString& format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime); const wxDateTime& dateDef = wxDefaultDateTime);
// parse a string containing the date/time in "free" format, this // parse a string containing the date/time in "free" format, this
// function will try to make an educated guess at the string contents // function will try to make an educated guess at the string contents
@@ -1057,7 +1057,7 @@ public:
// argument corresponds to the preferred date and time representation // argument corresponds to the preferred date and time representation
// for the current locale) and returns the string containing the // for the current locale) and returns the string containing the
// resulting text representation // resulting text representation
wxString Format(const wxChar *format = wxDefaultDateTimeFormat, wxString Format(const wxString& format = wxDefaultDateTimeFormat,
const TimeZone& tz = Local) const; const TimeZone& tz = Local) const;
// preferred date representation for the current locale // preferred date representation for the current locale
wxString FormatDate() const { return Format(_T("%x")); } wxString FormatDate() const { return Format(_T("%x")); }
@@ -1294,7 +1294,7 @@ public:
// resulting text representation. Notice that only some of format // resulting text representation. Notice that only some of format
// specifiers valid for wxDateTime are valid for wxTimeSpan: hours, // specifiers valid for wxDateTime are valid for wxTimeSpan: hours,
// minutes and seconds make sense, but not "PM/AM" string for example. // minutes and seconds make sense, but not "PM/AM" string for example.
wxString Format(const wxChar *format = wxDefaultTimeSpanFormat) const; wxString Format(const wxString& format = wxDefaultTimeSpanFormat) const;
// implementation // implementation
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

32
src/common/datetime.cpp
View File

@@ -451,7 +451,7 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
#ifdef HAVE_STRFTIME #ifdef HAVE_STRFTIME
// this function is a wrapper around strftime(3) adding error checking // this function is a wrapper around strftime(3) adding error checking
static wxString CallStrftime(const wxChar *format, const tm* tm) static wxString CallStrftime(const wxString& format, const tm* tm)
{ {
wxChar buf[4096]; wxChar buf[4096];
// Create temp wxString here to work around mingw/cygwin bug 1046059 // Create temp wxString here to work around mingw/cygwin bug 1046059
@@ -2279,9 +2279,10 @@ wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
// wxDateTime to/from text representations // wxDateTime to/from text representations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const wxString wxDateTime::Format(const wxString& format, const TimeZone& tz) const
{ {
wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxDateTime::Format") ); wxCHECK_MSG( !format.empty(), wxEmptyString,
_T("NULL format in wxDateTime::Format") );
// we have to use our own implementation if the date is out of range of // we have to use our own implementation if the date is out of range of
// strftime() or if we use non standard specificators // strftime() or if we use non standard specificators
@@ -2349,7 +2350,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
tmTimeOnly.tm_isdst = 0; // no DST, we adjust for tz ourselves tmTimeOnly.tm_isdst = 0; // no DST, we adjust for tz ourselves
wxString tmp, res, fmt; wxString tmp, res, fmt;
for ( const wxChar *p = format; *p; p++ ) for ( wxString::const_iterator p = format.begin(); p != format.end(); ++p )
{ {
if ( *p != _T('%') ) if ( *p != _T('%') )
{ {
@@ -2360,7 +2361,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
} }
// set the default format // set the default format
switch ( *++p ) switch ( (*++p).GetValue() )
{ {
case _T('Y'): // year has 4 digits case _T('Y'): // year has 4 digits
fmt = _T("%04d"); fmt = _T("%04d");
@@ -2389,7 +2390,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
restart = false; restart = false;
// start of the format specification // start of the format specification
switch ( *p ) switch ( (*p).GetValue() )
{ {
case _T('a'): // a weekday name case _T('a'): // a weekday name
case _T('A'): case _T('A'):
@@ -3137,10 +3138,10 @@ static wxString GetLocaleDateFormat()
#endif // __WINDOWS__ #endif // __WINDOWS__
const wxChar *wxDateTime::ParseFormat(const wxChar *date, const wxChar *wxDateTime::ParseFormat(const wxChar *date,
const wxChar *format, const wxString& format,
const wxDateTime& dateDef) const wxDateTime& dateDef)
{ {
wxCHECK_MSG( date && format, (wxChar *)NULL, wxCHECK_MSG( date && !format.empty(), (wxChar *)NULL,
_T("NULL pointer in wxDateTime::ParseFormat()") ); _T("NULL pointer in wxDateTime::ParseFormat()") );
wxString str; wxString str;
@@ -3170,7 +3171,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
int year = 0; int year = 0;
const wxChar *input = date; const wxChar *input = date;
for ( const wxChar *fmt = format; *fmt; fmt++ ) for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt )
{ {
if ( *fmt != _T('%') ) if ( *fmt != _T('%') )
{ {
@@ -3211,7 +3212,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
// the default widths for the various fields // the default widths for the various fields
if ( !width ) if ( !width )
{ {
switch ( *fmt ) switch ( (*fmt).GetValue() )
{ {
case _T('Y'): // year has 4 digits case _T('Y'): // year has 4 digits
width = 4; width = 4;
@@ -3233,7 +3234,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
} }
// then the format itself // then the format itself
switch ( *fmt ) switch ( (*fmt).GetValue() )
{ {
case _T('a'): // a weekday name case _T('a'): // a weekday name
case _T('A'): case _T('A'):
@@ -4270,12 +4271,13 @@ enum TimeSpanPart
// And, to be better than MFC :-), we also have // And, to be better than MFC :-), we also have
// %E number of wEeks // %E number of wEeks
// %l milliseconds (000 - 999) // %l milliseconds (000 - 999)
wxString wxTimeSpan::Format(const wxChar *format) const wxString wxTimeSpan::Format(const wxString& format) const
{ {
wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxTimeSpan::Format") ); wxCHECK_MSG( !format.empty(), wxEmptyString,
_T("NULL format in wxTimeSpan::Format") );
wxString str; wxString str;
str.Alloc(wxStrlen(format)); str.Alloc(format.length());
// Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */) // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
// //
@@ -4293,7 +4295,7 @@ wxString wxTimeSpan::Format(const wxChar *format) const
// we remember the most important unit found so far // we remember the most important unit found so far
TimeSpanPart partBiggest = Part_MSec; TimeSpanPart partBiggest = Part_MSec;
for ( const wxChar *pch = format; *pch; pch++ ) for ( wxString::const_iterator pch = format.begin(); pch != format.end(); ++pch )
{ {
wxChar ch = *pch; wxChar ch = *pch;