another fix for wxUSE_DRAG_AND_DROP==0 build

[wxWidgets.git] / include / wx / propgrid / propgridiface.h

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 8c8b39d47d8b02ae2f7564148010bbe5e788db0d..c83dc78c9ec00134b4d5c2cc99d470165a81b6a8 100644 (file)
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -76,7 +76,7 @@ public:
     /** This constructor is required for NULL. */
     wxPGPropArgCls( int )
     {
-        m_ptr.property = (wxPGProperty*) NULL;
+        m_ptr.property = NULL;
         m_flags = IsProperty;
     }
     wxPGProperty* GetPtr( wxPropertyGridInterface* iface ) const;
@@ -1030,7 +1030,12 @@ public:
         If it has children (it may be category), then the same thing is done to
         them.
     */
-    void SetPropertyValueUnspecified( wxPGPropArg id );
+    void SetPropertyValueUnspecified( wxPGPropArg id )
+    {
+        wxPG_PROP_ARG_CALL_PROLOG()
+        wxVariant nullVariant;
+        SetPropVal(p, nullVariant);
+    }
 
 #ifndef SWIG
     /** Sets various property values from a list of wxVariants. If property with
@@ -1227,11 +1232,17 @@ public:
     void SetValidationFailureBehavior( int vfbFlags );
 
     /**
-        Sorts all properties.
+        Sorts all properties recursively.
+
+        @param flags
+            This can contain any of the following options:
+              wxPG_SORT_TOP_LEVEL_ONLY: Only sort categories and their
+                immediate children. Sorting done by wxPG_AUTO_SORT option
+                uses this.
 
         @see SortChildren, wxPropertyGrid::SetSortFunction
     */
-    void Sort();
+    void Sort( int flags = 0 );
 
     /**
         Sorts children of a property.
@@ -1239,15 +1250,16 @@ public:
         @param id
             Name or pointer to a property.
 
-        @param recursively
-            If @true, then children are sorted recursively.
+        @param flags
+            This can contain any of the following options:
+              wxPG_RECURSE: Sorts recursively.
 
         @see Sort, wxPropertyGrid::SetSortFunction
     */
-    void SortChildren( wxPGPropArg id, bool recursively = false )
+    void SortChildren( wxPGPropArg id, int flags = 0 )
     {
         wxPG_PROP_ARG_CALL_PROLOG()
-        m_pState->DoSortChildren(p, recursively);
+        m_pState->DoSortChildren(p, flags);
     }
 
 #ifdef SWIG