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

abandon attempts to make wxAnyStrPtr behave as bool: user-defined logical operators don't short circuit silently breaking existing code so it is better to not provide them at all; instead simply return bool from the new versions taking wxString::const_iterator; advise to use the new versions in the new code and so in our own files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-25 09:54:10 +00:00
parent 9c4ae52877
commit c398434d92
7 changed files with 190 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
interface/wx/datetime.h
View File

@@ -812,8 +812,7 @@ public:
@see Format()
*/
const char* ParseDate(const wxString& date,
wxString::const_iterator* end = NULL);
bool ParseDate(const wxString& date, wxString::const_iterator *end);
/**
Parses the string @a datetime containing the date and time in free
@@ -827,8 +826,7 @@ public:
See ParseFormat() for the description of function parameters and return
value.
*/
const char* ParseDateTime(const wxString& datetime,
wxString::const_iterator* end = NULL);
bool ParseDateTime(const wxString& datetime, wxString::const_iterator *end);
/**
This function parses the string @a date according to the given
@@ -849,12 +847,7 @@ public:
@a dateDef. If it is not specified, Today() is used as the default
date.
Notice that the return value of this method is not actually a pointer
but rather an object of a special proxy class which is convertible to
either @c char* or @c wchar_t* pointer. This is needed for
compatibility with the existing code but the new code should use @a end
parameter instead and just test whether the return value is @NULL or
not, e.g.:
Example of using this function:
@code
wxDateTime dt;
wxString str = "...";
@@ -875,26 +868,32 @@ public:
Used to fill in the date components not specified in the @a date
string.
@param end
If non-@NULL, will be filled with the iterator pointing to the
location where the parsing stopped. If the entire string was
consumed, it is set to @c date.end().
Will be filled with the iterator pointing to the location where the
parsing stopped if the function returns @true. If the entire string
was consumed, it is set to @c date.end(). Notice that this argument
must be non-@NULL.
@return
Pointer-like object indicating the location where the scan stopped
if parsing was successful or @NULL-like otherwise.
@true if at least part of the string was parsed successfully,
@false otherwise.
@see Format()
*/
const char* ParseFormat(const wxString& date,
const wxString& format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime,
wxString::const_iterator* end = NULL);
bool ParseFormat(const wxString& date,
const wxString& format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime,
wxString::const_iterator *end);
/**
@overload
*/
const char* ParseFormat(const wxString& date,
const wxString& format = wxDefaultDateTimeFormat,
wxString::const_iterator* end = NULL);
bool ParseFormat(const wxString& date,
const wxString& format = wxDefaultDateTimeFormat,
wxString::const_iterator *end);
/**
@overload
*/
bool ParseFormat(const wxString& date, wxString::const_iterator *end);
/**
This function parses the string containing the date and time in ISO
@@ -944,8 +943,7 @@ public:
See ParseFormat() for the description of function parameters and return
value.
*/
const char* ParseRfc822Date(const wxString& date,
wxString::const_iterator* end = NULL);
bool ParseRfc822Date(const wxString& date, wxString::const_iterator *end);
/**
This functions is like ParseDateTime(), but only allows the time to be
@@ -954,8 +952,7 @@ public:
See ParseFormat() for the description of function parameters and return
value.
*/
const char* ParseTime(const wxString& time,
wxString::const_iterator* end = NULL);
bool ParseTime(const wxString& time, wxString::const_iterator *end);
//@}