Fixed bug: wxPropertyGridInterface::SetPropertyReadOnly() with wxPG_DONT_RECURSE...

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

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index c850d2d43d5830df42968406fe5b1f8a228aeca3..d8dcf5363f1fe2f62d95bb34e6649ed10c855fe2 100644 (file)
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -1951,8 +1951,22 @@ public:
         else m_flags &= ~wxPG_PROP_COLLAPSED;
     }
 
         else m_flags &= ~wxPG_PROP_COLLAPSED;
     }
 

+    /**
+        Sets given property flag(s).
+    */

     void SetFlag( FlagType flag ) { m_flags |= flag; }
 
     void SetFlag( FlagType flag ) { m_flags |= flag; }
 

+    /**
+        Sets or clears given property flag(s).
+    */
+    void ChangeFlag( FlagType flag, bool set )
+    {
+        if ( set )
+            m_flags |= flag;
+        else
+            m_flags &= ~flag;
+    }
+

     void SetFlagRecursively( FlagType flag, bool set );
 
     void SetHelpString( const wxString& helpString )
     void SetFlagRecursively( FlagType flag, bool set );
 
     void SetHelpString( const wxString& helpString )

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 7694e80027349fe27cb38a4da0b9c5fe31e7ff06..3f93b4a2a6297355ed90dcc1a22e669251d0e5ff 100644 (file)
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -1021,7 +1021,7 @@ public:
         if ( flags & wxPG_RECURSE )
             p->SetFlagRecursively(wxPG_PROP_READONLY, set);
         else
         if ( flags & wxPG_RECURSE )
             p->SetFlagRecursively(wxPG_PROP_READONLY, set);
         else

-            p->SetFlag(wxPG_PROP_READONLY);
+            p->ChangeFlag(wxPG_PROP_READONLY, set);

     }
 
     /** Sets property's value to unspecified.
     }
 
     /** Sets property's value to unspecified.

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index dcda1ef198c409828adf0352d24c96d2f50bff71..88cf94dab81262daee9bf4c14771de0ae026abd0 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -1353,10 +1353,7 @@ void wxPGProperty::SetValueInEvent( wxVariant value ) const
 
 void wxPGProperty::SetFlagRecursively( FlagType flag, bool set )
 {
 
 void wxPGProperty::SetFlagRecursively( FlagType flag, bool set )
 {

-    if ( set )
-        SetFlag(flag);
-    else
-        ClearFlag(flag);
+    ChangeFlag(flag, set);

 
     unsigned int i;
     for ( i = 0; i < GetChildCount(); i++ )
 
     unsigned int i;
     for ( i = 0; i < GetChildCount(); i++ )