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

Have wxPropertyGrid::DoubleToString() to also take comma into account as a decimal separator. In addition, the function now returns target wxString (makes writing tests easier).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-12-13 16:07:49 +00:00
parent 0b4e4c3937
commit bac635ede2
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/propgrid/propgrid.h
View File

@@ -1547,11 +1547,11 @@ public:
/** Standardized double-to-string conversion. /** Standardized double-to-string conversion.
*/ */
static void DoubleToString( wxString& target, static const wxString& DoubleToString( wxString& target,
double value, double value,
int precision, int precision,
bool removeZeroes, bool removeZeroes,
wxString* precTemplate ); wxString* precTemplate = NULL );
/** /**
Call this from wxPGProperty::OnEvent() to cause property value to be Call this from wxPGProperty::OnEvent() to cause property value to be

6
src/propgrid/props.cpp
View File

@@ -666,7 +666,7 @@ wxFloatProperty::~wxFloatProperty() { }
// This helper method provides standard way for floating point-using // This helper method provides standard way for floating point-using
// properties to convert values to string. // properties to convert values to string.
void wxPropertyGrid::DoubleToString(wxString& target, const wxString& wxPropertyGrid::DoubleToString(wxString& target,
double value, double value,
int precision, int precision,
bool removeZeroes, bool removeZeroes,
@@ -722,7 +722,7 @@ void wxPropertyGrid::DoubleToString(wxString& target,
for ( ; i != target.end(); i++ ) for ( ; i != target.end(); i++ )
{ {
if ( *i != wxS('0') && *i != wxS('.') ) if ( *i != wxS('0') && *i != wxS('.') && *i != wxS(',') )
{ {
isZero = false; isZero = false;
break; break;
@@ -732,6 +732,8 @@ void wxPropertyGrid::DoubleToString(wxString& target,
if ( isZero ) if ( isZero )
target.erase(target.begin()); target.erase(target.begin());
} }
return target;
} }
wxString wxFloatProperty::ValueToString( wxVariant& value, wxString wxFloatProperty::ValueToString( wxVariant& value,