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

compilation fix after wxDateTime::ParseFormat() changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-01-07 01:20:45 +00:00
parent 71ebd60b06
commit 6a147dfefd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/gridctrl.cpp
View File

@@ -65,7 +65,8 @@ wxString wxGridCellDateTimeRenderer::GetString(const wxGrid& grid, int row, int
{ {
void * tempval = table->GetValueAsCustom(row, col,wxGRID_VALUE_DATETIME); void * tempval = table->GetValueAsCustom(row, col,wxGRID_VALUE_DATETIME);
if (tempval){ if (tempval)
{
val = *((wxDateTime *)tempval); val = *((wxDateTime *)tempval);
hasDatetime = true; hasDatetime = true;
delete (wxDateTime *)tempval; delete (wxDateTime *)tempval;
@@ -76,13 +77,14 @@ wxString wxGridCellDateTimeRenderer::GetString(const wxGrid& grid, int row, int
if (!hasDatetime ) if (!hasDatetime )
{ {
text = table->GetValue(row, col); text = table->GetValue(row, col);
hasDatetime = (val.ParseFormat(text.c_str(), m_iformat, m_dateDef) != (wxChar *)NULL) ; const char * const end = val.ParseFormat(text, m_iformat, m_dateDef);
hasDatetime = end && !*end;
} }
if ( hasDatetime ) if ( hasDatetime )
text = val.Format(m_oformat, m_tz ); text = val.Format(m_oformat, m_tz );
//If we faild to parse string just show what we where given? // If we failed to parse string just show what we where given?
return text; return text;
} }