new file added

[wxWidgets.git] / src / propgrid / props.cpp

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 27cb58494921d601ba453f063ef05b9e768c3001..1463a9000c0501599b36fc1dd05ddfa1bb9e47bd 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -95,7 +95,9 @@ wxString wxStringProperty::ValueToString( wxVariant& value,
     if ( GetChildCount() && HasFlag(wxPG_PROP_COMPOSED_VALUE) )
     {
         // Value stored in m_value is non-editable, non-full value
     if ( GetChildCount() && HasFlag(wxPG_PROP_COMPOSED_VALUE) )
     {
         // Value stored in m_value is non-editable, non-full value

-        if ( (argFlags & wxPG_FULL_VALUE) || (argFlags & wxPG_EDITABLE_VALUE) )
+        if ( (argFlags & wxPG_FULL_VALUE) ||
+             (argFlags & wxPG_EDITABLE_VALUE) ||
+             !s.length() )

         {
             // Calling this under incorrect conditions will fail
             wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT,
         {
             // Calling this under incorrect conditions will fail
             wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT,


@@ -186,8 +188,10 @@ wxNumericPropertyValidator::
     {
         arr.Add(wxS("+"));
         arr.Add(wxS("-"));
     {
         arr.Add(wxS("+"));
         arr.Add(wxS("-"));

-        arr.Add(wxS("."));

         arr.Add(wxS("e"));
         arr.Add(wxS("e"));

+
+        // Use locale-specific decimal point
+        arr.Add(wxString::Format("%g", 1.1)[1]);

     }
 
     SetIncludes(arr);
     }
 
     SetIncludes(arr);


@@ -199,14 +203,14 @@ bool wxNumericPropertyValidator::Validate(wxWindow* parent)
         return false;
 
     wxWindow* wnd = GetWindow();
         return false;
 
     wxWindow* wnd = GetWindow();

-    if ( !wnd->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    if ( !wxDynamicCast(wnd, wxTextCtrl) )

         return true;
 
     // Do not allow zero-length string
     wxTextCtrl* tc = static_cast<wxTextCtrl*>(wnd);
     wxString text = tc->GetValue();
 
         return true;
 
     // Do not allow zero-length string
     wxTextCtrl* tc = static_cast<wxTextCtrl*>(wnd);
     wxString text = tc->GetValue();
 

-    if ( !text.length() )
+    if ( text.empty() )

         return false;
 
     return true;
         return false;
 
     return true;


@@ -256,7 +260,7 @@ bool wxIntProperty::StringToValue( wxVariant& variant, const wxString& text, int
     wxString s;
     long value32;
 
     wxString s;
     long value32;
 

-    if ( text.length() == 0 )
+    if ( text.empty() )

     {
         variant.MakeNull();
         return true;
     {
         variant.MakeNull();
         return true;


@@ -470,9 +474,9 @@ wxValidator* wxIntProperty::DoGetValidator() const
 #define wxPG_UINT_TEMPLATE_MAX 8
 
 static const wxChar* const gs_uintTemplates32[wxPG_UINT_TEMPLATE_MAX] = {
 #define wxPG_UINT_TEMPLATE_MAX 8
 
 static const wxChar* const gs_uintTemplates32[wxPG_UINT_TEMPLATE_MAX] = {

-    wxT("%x"),wxT("0x%x"),wxT("$%x"),
-    wxT("%X"),wxT("0x%X"),wxT("$%X"),
-    wxT("%u"),wxT("%o")
+    wxT("%lx"),wxT("0x%lx"),wxT("$%lx"),
+    wxT("%lX"),wxT("0x%lX"),wxT("$%lX"),
+    wxT("%lu"),wxT("%lo")

 };
 
 static const char* const gs_uintTemplates64[wxPG_UINT_TEMPLATE_MAX] = {
 };
 
 static const char* const gs_uintTemplates64[wxPG_UINT_TEMPLATE_MAX] = {


@@ -535,7 +539,7 @@ bool wxUIntProperty::StringToValue( wxVariant& variant, const wxString& text, in
     wxString variantType = variant.GetType();
     bool isPrevLong = variantType == wxPG_VARIANT_TYPE_LONG;
 
     wxString variantType = variant.GetType();
     bool isPrevLong = variantType == wxPG_VARIANT_TYPE_LONG;
 

-    if ( text.length() == 0 )
+    if ( text.empty() )

     {
         variant.MakeNull();
         return true;
     {
         variant.MakeNull();
         return true;


@@ -666,11 +670,11 @@ wxFloatProperty::~wxFloatProperty() { }
 
 // This helper method provides standard way for floating point-using
 // properties to convert values to string.
 
 // 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 )
     {
 {
     if ( precision >= 0 )
     {


@@ -678,7 +682,7 @@ void wxPropertyGrid::DoubleToString(wxString& target,
         if (!precTemplate)
             precTemplate = &text1;
 
         if (!precTemplate)
             precTemplate = &text1;
 

-        if ( !precTemplate->length() )
+        if ( precTemplate->empty() )

         {
             *precTemplate = wxS("%.");
             *precTemplate << wxString::Format( wxS("%i"), precision );
         {
             *precTemplate = wxS("%.");
             *precTemplate << wxString::Format( wxS("%i"), precision );


@@ -692,7 +696,7 @@ void wxPropertyGrid::DoubleToString(wxString& target,
         target.Printf( wxS("%f"), value );
     }
 
         target.Printf( wxS("%f"), value );
     }
 

-    if ( removeZeroes && precision != 0 && target.length() )
+    if ( removeZeroes && precision != 0 && !target.empty() )

     {
         // Remove excess zeroes (do not remove this code just yet,
         // since sprintf can't do the same consistently across platforms).
     {
         // Remove excess zeroes (do not remove this code just yet,
         // since sprintf can't do the same consistently across platforms).


@@ -722,7 +726,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;
                 break;
             {
                 isZero = false;
                 break;


@@ -732,6 +736,8 @@ void wxPropertyGrid::DoubleToString(wxString& target,
         if ( isZero )
             target.erase(target.begin());
     }
         if ( isZero )
             target.erase(target.begin());
     }

+
+    return target;

 }
 
 wxString wxFloatProperty::ValueToString( wxVariant& value,
 }
 
 wxString wxFloatProperty::ValueToString( wxVariant& value,


@@ -754,7 +760,7 @@ bool wxFloatProperty::StringToValue( wxVariant& variant, const wxString& text, i
     wxString s;
     double value;
 
     wxString s;
     double value;
 

-    if ( text.length() == 0 )
+    if ( text.empty() )

     {
         variant.MakeNull();
         return true;
     {
         variant.MakeNull();
         return true;


@@ -908,7 +914,7 @@ bool wxBoolProperty::StringToValue( wxVariant& variant, const wxString& text, in
          text.CmpNoCase(m_label) == 0 )
         boolValue = true;
 
          text.CmpNoCase(m_label) == 0 )
         boolValue = true;
 

-    if ( text.length() == 0 )
+    if ( text.empty() )

     {
         variant.MakeNull();
         return true;
     {
         variant.MakeNull();
         return true;


@@ -1074,7 +1080,7 @@ bool wxEnumProperty::ValidateValue( wxVariant& value, wxPGValidationInfo& WXUNUS
     // unless property has string as preferred value type
     // To reduce code size, use conversion here as well
     if ( value.GetType() == wxPG_VARIANT_TYPE_STRING &&
     // unless property has string as preferred value type
     // To reduce code size, use conversion here as well
     if ( value.GetType() == wxPG_VARIANT_TYPE_STRING &&

-         !this->IsKindOf(CLASSINFO(wxEditEnumProperty)) )
+         !wxDynamicCastThis(wxEditEnumProperty) )

         return ValueFromString_( value, value.GetString(), wxPG_PROPERTY_SPECIFIC );
 
     return true;
         return ValueFromString_( value, value.GetString(), wxPG_PROPERTY_SPECIFIC );
 
     return true;


@@ -1121,7 +1127,7 @@ bool wxEnumProperty::ValueFromString_( wxVariant& value, const wxString& text, i
 
     bool asText = false;
 
 
     bool asText = false;
 

-    bool isEdit = this->IsKindOf(CLASSINFO(wxEditEnumProperty));
+    bool isEdit = this->IsKindOf(wxCLASSINFO(wxEditEnumProperty));

 
     // If text not any of the choices, store as text instead
     // (but only if we are wxEditEnumProperty)
 
     // If text not any of the choices, store as text instead
     // (but only if we are wxEditEnumProperty)


@@ -1512,7 +1518,7 @@ bool wxFlagsProperty::StringToValue( wxVariant& variant, const wxString& text, i
     // semicolons are no longer valid delimeters
     WX_PG_TOKENIZER1_BEGIN(text,wxS(','))
 
     // semicolons are no longer valid delimeters
     WX_PG_TOKENIZER1_BEGIN(text,wxS(','))
 

-        if ( token.length() )
+        if ( !token.empty() )

         {
             // Determine which one it is
             long bit = IdToBit( token );
         {
             // Determine which one it is
             long bit = IdToBit( token );


@@ -1677,14 +1683,14 @@ bool wxPGFileDialogAdapter::DoShowDialog( wxPropertyGrid* propGrid, wxPGProperty
     wxString path;
     int indFilter = -1;
 
     wxString path;
     int indFilter = -1;
 

-    if ( property->IsKindOf(CLASSINFO(wxFileProperty)) )
+    if ( wxDynamicCast(property, wxFileProperty) )

     {
         fileProp = ((wxFileProperty*)property);
         wxFileName filename = fileProp->GetValue().GetString();
         path = filename.GetPath();
         indFilter = fileProp->m_indFilter;
 
     {
         fileProp = ((wxFileProperty*)property);
         wxFileName filename = fileProp->GetValue().GetString();
         path = filename.GetPath();
         indFilter = fileProp->m_indFilter;
 

-        if ( !path.length() && fileProp->m_basePath.length() )
+        if ( path.empty() && !fileProp->m_basePath.empty() )

             path = fileProp->m_basePath;
     }
     else
             path = fileProp->m_basePath;
     }
     else


@@ -1697,8 +1703,8 @@ bool wxPGFileDialogAdapter::DoShowDialog( wxPropertyGrid* propGrid, wxPGProperty
                       property->GetAttribute(wxS("DialogTitle"), _("Choose a file")),
                       property->GetAttribute(wxS("InitialPath"), path),
                       wxEmptyString,
                       property->GetAttribute(wxS("DialogTitle"), _("Choose a file")),
                       property->GetAttribute(wxS("InitialPath"), path),
                       wxEmptyString,

-                      property->GetAttribute(wxPG_FILE_WILDCARD, _("All files (*.*)|*.*")),
-                      0,
+                      property->GetAttribute(wxPG_FILE_WILDCARD, wxALL_FILES),
+                      property->GetAttributeAsLong(wxPG_FILE_DIALOG_STYLE, 0),

                       wxDefaultPosition );
 
     if ( indFilter >= 0 )
                       wxDefaultPosition );
 
     if ( indFilter >= 0 )


@@ -1726,7 +1732,7 @@ wxFileProperty::wxFileProperty( const wxString& label, const wxString& name,
 {
     m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
     m_indFilter = -1;
 {
     m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
     m_indFilter = -1;

-    SetAttribute( wxPG_FILE_WILDCARD, _("All files (*.*)|*.*") );
+    SetAttribute( wxPG_FILE_WILDCARD, wxALL_FILES);

 
     SetValue(value);
 }
 
     SetValue(value);
 }


@@ -1775,7 +1781,7 @@ void wxFileProperty::OnSetValue()
     }
 
     // Find index for extension.
     }
 
     // Find index for extension.

-    if ( m_indFilter < 0 && fnstr.length() )
+    if ( m_indFilter < 0 && !fnstr.empty() )

     {
         wxString ext = filename.GetExt();
         int curind = 0;
     {
         wxString ext = filename.GetExt();
         int curind = 0;


@@ -1792,7 +1798,7 @@ void wxFileProperty::OnSetValue()
                 pos = len;
             wxString found_ext = m_wildcard.substr(ext_begin, pos-ext_begin);
 
                 pos = len;
             wxString found_ext = m_wildcard.substr(ext_begin, pos-ext_begin);
 

-            if ( found_ext.length() > 0 )
+            if ( !found_ext.empty() )

             {
                 if ( found_ext[0] == wxS('*') )
                 {
             {
                 if ( found_ext[0] == wxS('*') )
                 {


@@ -1833,7 +1839,7 @@ wxString wxFileProperty::ValueToString( wxVariant& value,
         return wxEmptyString;
 
     wxString fullName = filename.GetFullName();
         return wxEmptyString;
 
     wxString fullName = filename.GetFullName();

-    if ( !fullName.length() )
+    if ( fullName.empty() )

         return wxEmptyString;
 
     if ( argFlags & wxPG_FULL_VALUE )
         return wxEmptyString;
 
     if ( argFlags & wxPG_FULL_VALUE )


@@ -1842,7 +1848,7 @@ wxString wxFileProperty::ValueToString( wxVariant& value,
     }
     else if ( m_flags & wxPG_PROP_SHOW_FULL_FILENAME )
     {
     }
     else if ( m_flags & wxPG_PROP_SHOW_FULL_FILENAME )
     {

-        if ( m_basePath.Length() )
+        if ( !m_basePath.empty() )

         {
             wxFileName fn2(filename);
             fn2.MakeRelativeTo(m_basePath);
         {
             wxFileName fn2(filename);
             fn2.MakeRelativeTo(m_basePath);


@@ -2180,7 +2186,7 @@ bool wxPGArrayEditorDialog::Create( wxWindow *parent,
     wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
 
     // Message
     wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
 
     // Message

-    if ( message.length() )
+    if ( !message.empty() )

         topsizer->Add( new wxStaticText(this,-1,message),
             0, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxALL, spacing );
 
         topsizer->Add( new wxStaticText(this,-1,message),
             0, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxALL, spacing );
 


@@ -2549,7 +2555,7 @@ wxArrayStringProperty::ArrayStringToString( wxString& dst,
         if ( flags & Escape )
         {
             str.Replace( wxS("\\"), wxS("\\\\"), true );
         if ( flags & Escape )
         {
             str.Replace( wxS("\\"), wxS("\\\\"), true );

-            if ( pdr.length() )
+            if ( !pdr.empty() )

                 str.Replace( preas, pdr, true );
         }
 
                 str.Replace( preas, pdr, true );
         }