From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Mon, 13 Dec 2010 16:07:49 +0000 (+0000)
Subject: Have wxPropertyGrid::DoubleToString() to also take comma into account as a decimal... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bac635ede250066fffeaa96c6c78cafd4e761fd6?ds=inline

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).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 45691311fa..874c576b09 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -1547,11 +1547,11 @@ public:
 
     /** Standardized double-to-string conversion.
     */
-    static void DoubleToString( wxString& target,
-                                double value,
-                                int precision,
-                                bool removeZeroes,
-                                wxString* precTemplate );
+    static const wxString& DoubleToString( wxString& target,
+                                           double value,
+                                           int precision,
+                                           bool removeZeroes,
+                                           wxString* precTemplate = NULL );
 
     /**
         Call this from wxPGProperty::OnEvent() to cause property value to be
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 27cb584949..f8357d4408 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -666,11 +666,11 @@ wxFloatProperty::~wxFloatProperty() { }
 
 // This helper method provides standard way for floating point-using
 // properties to convert values to string.
-void wxPropertyGrid::DoubleToString(wxString& target,
-                                    double value,
-                                    int precision,
-                                    bool removeZeroes,
-                                    wxString* precTemplate)
+const wxString& wxPropertyGrid::DoubleToString(wxString& target,
+                                               double value,
+                                               int precision,
+                                               bool removeZeroes,
+                                               wxString* precTemplate)
 {
     if ( precision >= 0 )
     {
@@ -722,7 +722,7 @@ void wxPropertyGrid::DoubleToString(wxString& target,
 
         for ( ; i != target.end(); i++ )
         {
-            if ( *i != wxS('0') && *i != wxS('.') )
+            if ( *i != wxS('0') && *i != wxS('.') && *i != wxS(',') )
             {
                 isZero = false;
                 break;
@@ -732,6 +732,8 @@ void wxPropertyGrid::DoubleToString(wxString& target,
         if ( isZero )
             target.erase(target.begin());
     }
+
+    return target;
 }
 
 wxString wxFloatProperty::ValueToString( wxVariant& value,