reduce the margins around bitmaps to avoid truncating the label unnecessarily

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

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 328084687586732832936a0c784d045ae464c334..ac6d0d192cf1b01dce98403257808072c54cbc11 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -149,8 +149,10 @@ int wxPGCellRenderer::PreDrawCell( wxDC& dc, const wxRect& rect, const wxPGCell&
         dc.SetTextForeground(cell.GetFgCol());
     }
 
         dc.SetTextForeground(cell.GetFgCol());
     }
 

-    // Draw Background
-    dc.DrawRectangle(rect);
+    // Draw Background, but only if not rendering in control
+    // (as control already has rendered correct background).
+    if ( !(flags & (Control|ChoicePopup)) )
+        dc.DrawRectangle(rect);

 
     const wxBitmap& bmp = cell.GetBitmap();
     if ( bmp.Ok() &&
 
     const wxBitmap& bmp = cell.GetBitmap();
     if ( bmp.Ok() &&


@@ -227,15 +229,7 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
                 paintdata.m_drawnWidth = imageSize.x;
                 paintdata.m_drawnHeight = imageSize.y;
 
                 paintdata.m_drawnWidth = imageSize.x;
                 paintdata.m_drawnHeight = imageSize.y;
 

-                if ( !isUnspecified )
-                {
-                    property->OnCustomPaint( dc, imageRect, paintdata );
-                }
-                else
-                {
-                    dc.SetBrush(*wxWHITE_BRUSH);
-                    dc.DrawRectangle(imageRect);
-                }
+                property->OnCustomPaint( dc, imageRect, paintdata );

 
                 imageOffset = paintdata.m_drawnWidth;
             }
 
                 imageOffset = paintdata.m_drawnWidth;
             }


@@ -645,12 +639,6 @@ int wxPGProperty::Index( const wxPGProperty* p ) const
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-void wxPGProperty::UpdateControl( wxWindow* primary )
-{
-    if ( primary )
-        GetEditorClass()->UpdateControl(this, primary);
-}
-

 bool wxPGProperty::ValidateValue( wxVariant& WXUNUSED(value), wxPGValidationInfo& WXUNUSED(validationInfo) ) const
 {
     return true;
 bool wxPGProperty::ValidateValue( wxVariant& WXUNUSED(value), wxPGValidationInfo& WXUNUSED(validationInfo) ) const
 {
     return true;


@@ -664,6 +652,10 @@ void wxPGProperty::RefreshChildren ()
 {
 }
 
 {
 }
 

+void wxPGProperty::OnValidationFailure( wxVariant& WXUNUSED(pendingValue) )
+{
+}
+

 void wxPGProperty::GetDisplayInfo( unsigned int column,
                                    int choiceIndex,
                                    int flags,
 void wxPGProperty::GetDisplayInfo( unsigned int column,
                                    int choiceIndex,
                                    int flags,


@@ -796,7 +788,7 @@ void wxPGProperty::DoGenerateComposedValue( wxString& text,
                 childValue = overrideValue;
             else
                 childValue = curChild->GetValue();
                 childValue = overrideValue;
             else
                 childValue = curChild->GetValue();

-            node++;
+            ++node;

             if ( node != valueOverrides->end() )
                 overrideValue = *node;
             else
             if ( node != valueOverrides->end() )
                 overrideValue = *node;
             else


@@ -856,13 +848,13 @@ void wxPGProperty::DoGenerateComposedValue( wxString& text,
         }
     }
 
         }
     }
 

-    // Remove superfluous semicolon and space
-    wxString rest;
-    if ( text.EndsWith(wxS("; "), &rest) )
-        text = rest;
-

     if ( (unsigned int)i < m_children.size() )
     if ( (unsigned int)i < m_children.size() )

-        text += wxS("; ...");
+    {
+        if ( !text.EndsWith(wxS("; ")) )
+            text += wxS("; ...");
+        else
+            text += wxS("...");
+    }

 }
 
 wxString wxPGProperty::ValueToString( wxVariant& WXUNUSED(value),
 }
 
 wxString wxPGProperty::ValueToString( wxVariant& WXUNUSED(value),


@@ -984,6 +976,11 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
 
     for ( ;; )
     {
 
     for ( ;; )
     {

+        // How many units we iterate string forward at the end of loop?
+        // We need to keep track of this or risk going to negative
+        // with it-- operation.
+        unsigned int strPosIncrement = 1;
+

         if ( tokenStart != 0xFFFFFF )
         {
             // Token is running
         if ( tokenStart != 0xFFFFFF )
         {
             // Token is running


@@ -997,11 +994,12 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                 {
                     const wxPGProperty* child = Item(curChild);
                     wxVariant variant(child->GetValue());
                 {
                     const wxPGProperty* child = Item(curChild);
                     wxVariant variant(child->GetValue());

-                    variant.SetName(child->GetBaseName());
+                    wxString childName = child->GetBaseName();

 
                 #ifdef __WXDEBUG__
                     if ( debug_print )
 
                 #ifdef __WXDEBUG__
                     if ( debug_print )

-                        wxLogDebug(wxT("token = '%s', child = %s"),token.c_str(),child->GetLabel().c_str());
+                        wxLogDebug(wxT("token = '%s', child = %s"),
+                                   token.c_str(), childName.c_str());

                 #endif
 
                     // Add only if editable or setting programmatically
                 #endif
 
                     // Add only if editable or setting programmatically


@@ -1010,18 +1008,18 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     {
                         if ( len > 0 )
                         {
                     {
                         if ( len > 0 )
                         {

-                            bool wasUnspecified = child->IsValueUnspecified();
-
-                            if ( child->StringToValue(variant, token, propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )
+                            if ( child->StringToValue(variant, token,
+                                 propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )

                             {
                             {

-                                // Clear unspecified flag only if OnSetValue() didn't
-                                // affect it.
-                                if ( child->IsValueUnspecified() &&
-                                     (wasUnspecified || !UsesAutoUnspecified()) )
-                                {
-                                    variant = child->GetDefaultValue();
-                                }
-
+                                // We really need to set the variant's name
+                                // *after* child->StringToValue() has been
+                                // called, since variant's value may be set by
+                                // assigning another variant into it, which
+                                // then usually causes name to be copied (ie.
+                                // usually cleared) as well. wxBoolProperty
+                                // being case in point with its use of
+                                // wxPGVariant_Bool macro as an optimization.
+                                variant.SetName(childName);

                                 list.Append(variant);
 
                                 changed = true;
                                 list.Append(variant);
 
                                 changed = true;


@@ -1031,6 +1029,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                         {
                             // Empty, becomes unspecified
                             variant.MakeNull();
                         {
                             // Empty, becomes unspecified
                             variant.MakeNull();

+                            variant.SetName(childName);

                             list.Append(variant);
                             changed = true;
                         }
                             list.Append(variant);
                             changed = true;
                         }


@@ -1057,7 +1056,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                 {
                     int depth = 1;
 
                 {
                     int depth = 1;
 

-                    if ( it != text.end() ) it++;
+                    if ( it != text.end() ) ++it;

                     pos++;
                     size_t startPos = pos;
 
                     pos++;
                     size_t startPos = pos;
 


@@ -1065,7 +1064,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     while ( it != text.end() && depth > 0 )
                     {
                         a = *it;
                     while ( it != text.end() && depth > 0 )
                     {
                         a = *it;

-                        it++;
+                        ++it;

                         pos++;
 
                         if ( a == wxS(']') )
                         pos++;
 
                         if ( a == wxS(']') )


@@ -1087,23 +1086,23 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
                          !child->HasFlag(wxPG_PROP_DISABLED|wxPG_PROP_READONLY) )
                     {
                     if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
                          !child->HasFlag(wxPG_PROP_DISABLED|wxPG_PROP_READONLY) )
                     {

-                        bool stvRes = child->StringToValue( variant, token, propagatedFlags );
+                        wxString childName = child->GetBaseName();
+
+                        bool stvRes = child->StringToValue( variant, token,
+                                                            propagatedFlags );

                         if ( stvRes || (variant != oldChildValue) )
                         {
                         if ( stvRes || (variant != oldChildValue) )
                         {

-                            if ( stvRes )
-                                changed = true;
+                            variant.SetName(childName);
+                            list.Append(variant);
+
+                            changed = true;

                         }
                         else
                         {
                         }
                         else
                         {

-                            // Failed, becomes unspecified
-                            variant.MakeNull();
-                            changed = true;
+                            // No changes...

                         }
                     }
 
                         }
                     }
 

-                    variant.SetName(child->GetBaseName());
-                    list.Append(variant);
-

                     curChild++;
                     if ( curChild >= iMax )
                         break;
                     curChild++;
                     if ( curChild >= iMax )
                         break;


@@ -1117,10 +1116,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     tokenStart = pos;
 
                     if ( a == delimeter )
                     tokenStart = pos;
 
                     if ( a == delimeter )

-                    {
-                        pos--;
-                        it--;
-                    }
+                        strPosIncrement -= 1;

                 }
             }
         }
                 }
             }
         }


@@ -1128,7 +1124,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
         if ( a == 0 )
             break;
 
         if ( a == 0 )
             break;
 

-        it++;
+        it += strPosIncrement;
+

         if ( it != text.end() )
         {
             a = *it;
         if ( it != text.end() )
         {
             a = *it;


@@ -1137,7 +1134,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
         {
             a = 0;
         }
         {
             a = 0;
         }

-        pos++;
+
+        pos += strPosIncrement;

     }
 
     if ( changed )
     }
 
     if ( changed )


@@ -1253,7 +1251,7 @@ void wxPGProperty::SetValue( wxVariant value, wxVariant* pList, int flags )
 
             // Children in list can be in any order, but we will give hint to
             // GetPropertyByNameWH(). This optimizes for full list parsing.
 
             // Children in list can be in any order, but we will give hint to
             // GetPropertyByNameWH(). This optimizes for full list parsing.

-            for ( node = list.begin(); node != list.end(); node++ )
+            for ( node = list.begin(); node != list.end(); ++node )

             {
                 wxVariant& childValue = *((wxVariant*)*node);
                 wxPGProperty* child = GetPropertyByNameWH(childValue.GetName(), i);
             {
                 wxVariant& childValue = *((wxVariant*)*node);
                 wxPGProperty* child = GetPropertyByNameWH(childValue.GetName(), i);


@@ -1291,9 +1289,6 @@ void wxPGProperty::SetValue( wxVariant value, wxVariant* pList, int flags )
         {
             m_value = value;
             OnSetValue();
         {
             m_value = value;
             OnSetValue();

-
-            if ( !(flags & wxPG_SETVAL_FROM_PARENT) )
-                UpdateParentValues();

         }
 
         if ( flags & wxPG_SETVAL_BY_USER )
         }
 
         if ( flags & wxPG_SETVAL_BY_USER )


@@ -1323,6 +1318,9 @@ void wxPGProperty::SetValue( wxVariant value, wxVariant* pList, int flags )
         }
     }
 
         }
     }
 

+    if ( !(flags & wxPG_SETVAL_FROM_PARENT) )
+        UpdateParentValues();
+

     //
     // Update editor control
     //
     //
     // Update editor control
     //


@@ -1352,18 +1350,13 @@ void wxPGProperty::SetFlagRecursively( FlagType flag, bool set )
 
 void wxPGProperty::RefreshEditor()
 {
 
 void wxPGProperty::RefreshEditor()
 {

-    if ( m_parent && GetParentState() )
-    {
-        wxPropertyGrid* pg = GetParentState()->GetGrid();
-        if ( pg->GetSelectedProperty() == this )
-        {
-            wxWindow* editor = pg->GetEditorControl();
-            if ( editor )
-                GetEditorClass()->UpdateControl( this, editor );
-        }
-    }
-}
+    if ( !m_parent )
+        return;

 
 

+    wxPropertyGrid* pg = GetGrid();
+    if ( pg && pg->GetSelectedProperty() == this )
+        pg->RefreshEditor();
+}

 
 wxVariant wxPGProperty::GetDefaultValue() const
 {
 
 wxVariant wxPGProperty::GetDefaultValue() const
 {


@@ -2292,6 +2285,17 @@ void wxPGProperty::Empty()
     m_children.clear();
 }
 
     m_children.clear();
 }
 

+void wxPGProperty::DeleteChildren()
+{
+    wxPropertyGridPageState* state = m_parentState;
+
+    while ( GetChildCount() )
+    {
+        wxPGProperty* child = Item(GetChildCount()-1);
+        state->DoDelete(child, true);
+    }
+}
+

 void wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue),
                                  int WXUNUSED(childIndex),
                                  wxVariant& WXUNUSED(childValue) ) const
 void wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue),
                                  int WXUNUSED(childIndex),
                                  wxVariant& WXUNUSED(childValue) ) const


@@ -2321,7 +2325,7 @@ bool wxPGProperty::AreAllChildrenSpecified( wxVariant* pendingList ) const
         {
             const wxString& childName = child->GetBaseName();
 
         {
             const wxString& childName = child->GetBaseName();
 

-            for ( ; node != pList->end(); node++ )
+            for ( ; node != pList->end(); ++node )

             {
                 const wxVariant& item = *((const wxVariant*)*node);
                 if ( item.GetName() == childName )
             {
                 const wxVariant& item = *((const wxVariant*)*node);
                 if ( item.GetName() == childName )


@@ -2510,7 +2514,7 @@ wxPGAttributeStorage::~wxPGAttributeStorage()
 {
     wxPGHashMapS2P::iterator it;
 
 {
     wxPGHashMapS2P::iterator it;
 

-    for ( it = m_map.begin(); it != m_map.end(); it++ )
+    for ( it = m_map.begin(); it != m_map.end(); ++it )

     {
         wxVariantData* data = (wxVariantData*) it->second;
         data->DecRef();
     {
         wxVariantData* data = (wxVariantData*) it->second;
         data->DecRef();