Simplified event based Drag API for wxDataViewCtrl

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

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 10ba288e6554b55a4e600673b7d572053f2c214f..05a46fdb0dc05c2bb8b83c433e3967e2a00391dd 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() &&


@@ -400,16 +402,16 @@ void wxPGProperty::Init()
     m_arrIndex = 0xFFFF;
     m_parent = NULL;
 
     m_arrIndex = 0xFFFF;
     m_parent = NULL;
 

-    m_parentState = (wxPropertyGridPageState*) NULL;
+    m_parentState = NULL;

 
     m_clientData = NULL;
     m_clientObject = NULL;
 
 
     m_clientData = NULL;
     m_clientObject = NULL;
 

-    m_customEditor = (wxPGEditor*) NULL;
+    m_customEditor = NULL;

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-    m_validator = (wxValidator*) NULL;
+    m_validator = NULL;

 #endif
 #endif

-    m_valueBitmap = (wxBitmap*) NULL;
+    m_valueBitmap = NULL;

 
     m_maxLen = 0; // infinite maximum length
 
 
     m_maxLen = 0; // infinite maximum length
 


@@ -637,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;


@@ -656,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,


@@ -976,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


@@ -989,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


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

-                            if ( child->StringToValue(variant, token, propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )
+                            if ( child->StringToValue(variant, token,
+                                 propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )

                             {
                             {

+                                // 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;


@@ -1013,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;
                         }


@@ -1069,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;


@@ -1099,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;

                 }
             }
         }
                 }
             }
         }


@@ -1110,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;


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

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

     }
 
     if ( changed )
     }
 
     if ( changed )


@@ -1273,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 )


@@ -1305,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
     //


@@ -1334,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
 {


@@ -1704,7 +1715,7 @@ void wxPGProperty::SetFlagsFromString( const wxString& str )
 
 wxValidator* wxPGProperty::DoGetValidator() const
 {
 
 wxValidator* wxPGProperty::DoGetValidator() const
 {

-    return (wxValidator*) NULL;
+    return NULL;

 }
 
 int wxPGProperty::InsertChoice( const wxString& label, int index, int value )
 }
 
 int wxPGProperty::InsertChoice( const wxString& label, int index, int value )


@@ -2124,7 +2135,7 @@ wxPGProperty* wxPGProperty::GetPropertyByName( const wxString& name ) const
     // Does it have point, then?
     int pos = name.Find(wxS('.'));
     if ( pos <= 0 )
     // Does it have point, then?
     int pos = name.Find(wxS('.'));
     if ( pos <= 0 )

-        return (wxPGProperty*) NULL;
+        return NULL;

 
     wxPGProperty* p = GetPropertyByName(name. substr(0,pos));
 
 
     wxPGProperty* p = GetPropertyByName(name. substr(0,pos));
 


@@ -2274,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


@@ -2382,7 +2404,7 @@ void wxPGProperty::SubPropsChanged( int oldSelInd )
         child->InitAfterAdded(state, grid);
     }
 
         child->InitAfterAdded(state, grid);
     }
 

-    wxPGProperty* sel = (wxPGProperty*) NULL;
+    wxPGProperty* sel = NULL;

     if ( oldSelInd >= (int)m_children.size() )
         oldSelInd = (int)m_children.size() - 1;
 
     if ( oldSelInd >= (int)m_children.size() )
         oldSelInd = (int)m_children.size() - 1;