no changes, just remove #if'd out code

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

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 8c8b39d47d8b02ae2f7564148010bbe5e788db0d..7694e80027349fe27cb38a4da0b9c5fe31e7ff06 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 )
     {
     /** 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;
         m_flags = IsProperty;
     }
     wxPGProperty* GetPtr( wxPropertyGridInterface* iface ) const;


@@ -95,7 +95,7 @@ private:
         IsWxString      = 0x01,
         IsCharPtr       = 0x02,
         IsWCharPtr      = 0x04,
         IsWxString      = 0x01,
         IsCharPtr       = 0x02,
         IsWCharPtr      = 0x04,

-        OwnsWxString    = 0x10,
+        OwnsWxString    = 0x10

     };
 
     union
     };
 
     union


@@ -352,14 +352,12 @@ public:
     }
 
     /**
     }
 
     /**

-        Returns id of property with given name (case-sensitive).
+        Returns pointer to a property with given name (case-sensitive).
+        If there is no property with such name, @NULL pointer is returned.

 
 

-        If there is no property with such name, returned property id is invalid
-        ( i.e. it will return false with IsOk method).
-        @remarks
-        - Sub-properties (i.e. properties which have parent that is not
-          category or root) can not be accessed globally by their name.
-          Instead, use "<property>.<subproperty>" in place of "<subproperty>".
+        @remarks Properties which have non-category, non-root parent
+                 can not be accessed globally by their name. Instead, use
+                 "<property>.<subproperty>" instead of "<subproperty>".

     */
     wxPGProperty* GetProperty( const wxString& name ) const
     {
     */
     wxPGProperty* GetProperty( const wxString& name ) const
     {


@@ -1030,7 +1028,12 @@ public:
         If it has children (it may be category), then the same thing is done to
         them.
     */
         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
 
 #ifndef SWIG
     /** Sets various property values from a list of wxVariants. If property with


@@ -1227,11 +1230,17 @@ public:
     void SetValidationFailureBehavior( int vfbFlags );
 
     /**
     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
     */
 
         @see SortChildren, wxPropertyGrid::SetSortFunction
     */

-    void Sort();
+    void Sort( int flags = 0 );

 
     /**
         Sorts children of a property.
 
     /**
         Sorts children of a property.


@@ -1239,15 +1248,16 @@ public:
         @param id
             Name or pointer to a property.
 
         @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
     */
 
         @see Sort, wxPropertyGrid::SetSortFunction
     */

-    void SortChildren( wxPGPropArg id, bool recursively = false )
+    void SortChildren( wxPGPropArg id, int flags = 0 )

     {
         wxPG_PROP_ARG_CALL_PROLOG()
     {
         wxPG_PROP_ARG_CALL_PROLOG()

-        m_pState->DoSortChildren(p, recursively);
+        m_pState->DoSortChildren(p, flags);

     }
 
 #ifdef SWIG
     }
 
 #ifdef SWIG