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

check that the conversion to wxDateTime was really successful

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-25 09:20:20 +00:00
parent c5e8b33639
commit 73799292ca
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/variant.cpp
View File

@@ -1838,12 +1838,25 @@ bool wxVariant::Convert(wxDateTime* value) const
*value = ((wxVariantDataDateTime*)GetData())->GetValue(); *value = ((wxVariantDataDateTime*)GetData())->GetValue();
return true; return true;
} }
// Fallback to string conversion // Fallback to string conversion
wxString val; wxString val;
return Convert(&val) && if ( !Convert(&val) )
(value->ParseDateTime(val.c_str()/*FIXME-UTF8*/) || return false;
value->ParseDate(val.c_str()/*FIXME-UTF8*/) ||
value->ParseTime(val.c_str()/*FIXME-UTF8*/)); // Try to parse this as either date and time, only date or only time
// checking that the entire string was parsed
wxString::const_iterator end;
if ( value->ParseDateTime(val, &end) && end == val.end() )
return true;
if ( value->ParseDate(val, &end) && end == val.end() )
return true;
if ( value->ParseTime(val, &end) && end == val.end() )
return true;
return false;
} }
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME