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

Store format as wxString

Browse Source 
Using wxString here is simpler and not misleading.
This commit is contained in:
Artur Wieczorek
2018-11-10 20:40:59 +01:00
parent 7911d50335
commit c606a7fc9f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/propgrid/advprops.cpp
View File

@@ -2294,8 +2294,6 @@ bool wxDateProperty::StringToValue( wxVariant& variant, const wxString& text,
wxString wxDateProperty::ValueToString( wxVariant& value, wxString wxDateProperty::ValueToString( wxVariant& value,
int argFlags ) const int argFlags ) const
{ {
const wxChar* format = (const wxChar*) NULL;
wxDateTime dateTime = value.GetDateTime(); wxDateTime dateTime = value.GetDateTime();
if ( !dateTime.IsValid() ) if ( !dateTime.IsValid() )
@@ -2311,13 +2309,14 @@ wxString wxDateProperty::ValueToString( wxVariant& value,
ms_defaultDateFormat = DetermineDefaultDateFormat( showCentury ); ms_defaultDateFormat = DetermineDefaultDateFormat( showCentury );
} }
wxString format;
if ( !m_format.empty() && if ( !m_format.empty() &&
!(argFlags & wxPG_FULL_VALUE) ) !(argFlags & wxPG_FULL_VALUE) )
format = m_format.c_str(); format = m_format;
// Determine default from locale // Determine default from locale
if ( !format ) if ( format.empty() )
format = ms_defaultDateFormat.c_str(); format = ms_defaultDateFormat;
return dateTime.Format(format); return dateTime.Format(format);
} }