fix wxTextCtrl::Replace() under wxGTK; added unit test for it and describe its effect...

[wxWidgets.git] / interface / wx / propgrid / property.h

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index b5c50da74156b6d8b4c88b91c8e4d0bda101a636..9369d8cb964a5eb61e0b5318e906c0f21645f99d 100644 (file)
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -2,7 +2,7 @@
 // Name:        property.h
 // Purpose:     interface of wxPGProperty
 // Author:      wxWidgets team
 // Name:        property.h
 // Purpose:     interface of wxPGProperty
 // Author:      wxWidgets team

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -10,15 +10,15 @@
 #define wxNullProperty  ((wxPGProperty*)NULL)
 
 
 #define wxNullProperty  ((wxPGProperty*)NULL)
 
 

-/** @section propgrid_property_attributes wxPropertyGrid Property Attribute Identifiers
+/**
+    @section propgrid_property_attributes wxPropertyGrid Property Attribute Identifiers

 
 

-    wxPGProperty::SetAttribute() and
-    wxPropertyGridInterface::SetPropertyAttribute()
-    accept one of these as attribute name argument .
+    wxPGProperty::SetAttribute() and wxPropertyGridInterface::SetPropertyAttribute()
+    accept one of these as attribute name argument.

 
 

-    You can use strings instead of constants. However, some of these
-    constants are redefined to use cached strings which may reduce
-    your binary size by some amount.
+    You can use strings instead of constants.
+    However, some of these constants are redefined to use cached strings which
+    may reduce your binary size by some amount.

 
     @{
 */
 
     @{
 */


@@ -124,10 +124,15 @@
 */
 #define wxPG_ATTR_SPINCTRL_STEP             wxS("Step")
 
 */
 #define wxPG_ATTR_SPINCTRL_STEP             wxS("Step")
 

-/** SpinCtrl editor, bool. If true, value wraps at Min/Max.
+/** SpinCtrl editor, bool. If @true, value wraps at Min/Max.

 */
 #define wxPG_ATTR_SPINCTRL_WRAP             wxS("Wrap")
 
 */
 #define wxPG_ATTR_SPINCTRL_WRAP             wxS("Wrap")
 

+/** SpinCtrl editor, bool. If @true, value can also by changed by moving
+    mouse when left mouse button is being pressed.
+*/
+#define wxPG_ATTR_SPINCTRL_MOTIONSPIN       wxS("MotionSpin")
+

 /** wxMultiChoiceProperty, int. If 0, no user strings allowed. If 1, user strings
     appear before list strings. If 2, user strings appear after list string.
 */
 /** wxMultiChoiceProperty, int. If 0, no user strings allowed. If 1, user strings
     appear before list strings. If 2, user strings appear after list string.
 */


@@ -141,9 +146,10 @@
 /** @}
 */
 
 /** @}
 */
 

-// -----------------------------------------------------------------------

 
 

-/** @class wxPGProperty
+
+/**
+    @class wxPGProperty

 
     wxPGProperty is base class for all wxPropertyGrid properties. In
     sections below we cover few related topics.
 
     wxPGProperty is base class for all wxPropertyGrid properties. In
     sections below we cover few related topics.


@@ -187,11 +193,10 @@
     Simple string property. wxPG_STRING_PASSWORD attribute may be used
     to echo value as asterisks and use wxTE_PASSWORD for wxTextCtrl.
 
     Simple string property. wxPG_STRING_PASSWORD attribute may be used
     to echo value as asterisks and use wxTE_PASSWORD for wxTextCtrl.
 

-    @remarks
-    * wxStringProperty has a special trait: if it has value of "<composed>",
-      and also has child properties, then its displayed value becomes
-      composition of child property values, similar as with wxFontProperty,
-      for instance.
+    @remarks wxStringProperty has a special trait: if it has value of
+            "<composed>", and also has child properties, then its displayed
+            value becomes composition of child property values, similar as
+            with wxFontProperty, for instance.

 
     @subsection wxIntProperty
 
 
     @subsection wxIntProperty
 


@@ -235,6 +240,37 @@
     dialog. Note that in long string values, tabs are represented by "\t" and
     line break by "\n".
 
     dialog. Note that in long string values, tabs are represented by "\t" and
     line break by "\n".
 

+    To display custom dialog on button press, you can subclass
+    wxLongStringProperty and implement OnButtonClick, like this:
+
+    @code
+        virtual bool OnButtonClick( wxPropertyGrid* propGrid, wxString& value )
+        {
+            wxSize dialogSize(...size of your dialog...);
+
+            wxPoint dlgPos = propGrid->GetGoodEditorDialogPosition(this,
+                                                                   dialogSize)
+
+            // Create dialog dlg at dlgPos. Use value as initial string
+            // value.
+            ...
+
+            if ( dlg.ShowModal() == wxID_OK )
+            {
+                value = dlg.GetStringValue);
+                return true;
+            }
+            return false;
+        }
+    @endcode
+
+    Also, if you wish not to have line breaks and tabs translated to
+    escape sequences, then do following in constructor of your subclass:
+
+    @code
+        m_flags |= wxPG_PROP_NO_ESCAPE;
+    @endcode
+

     @subsection wxDirProperty
 
     Like wxLongStringProperty, but the button triggers dir selector instead.
     @subsection wxDirProperty
 
     Like wxLongStringProperty, but the button triggers dir selector instead.


@@ -245,7 +281,7 @@
     Like wxLongStringProperty, but the button triggers file selector instead.
     Default wildcard is "All files..." but this can be changed by setting
     wxPG_FILE_WILDCARD attribute (see wxFileDialog for format details).
     Like wxLongStringProperty, but the button triggers file selector instead.
     Default wildcard is "All files..." but this can be changed by setting
     wxPG_FILE_WILDCARD attribute (see wxFileDialog for format details).

-    Attribute wxPG_FILE_SHOW_FULL_PATH can be set to false inorder to show
+    Attribute wxPG_FILE_SHOW_FULL_PATH can be set to @false inorder to show

     only the filename, not the entire path.
 
     @subsection wxEnumProperty
     only the filename, not the entire path.
 
     @subsection wxEnumProperty


@@ -296,6 +332,8 @@
     <b>Useful alternate editor:</b> Choice.
 
     Represents wxColour. wxButton is used to trigger a colour picker dialog.
     <b>Useful alternate editor:</b> Choice.
 
     Represents wxColour. wxButton is used to trigger a colour picker dialog.

+    There are various sub-classing opportunities with this class. See
+    below in wxSystemColourProperty section for details.

 
     @subsection wxFontProperty
 
 
     @subsection wxFontProperty
 


@@ -306,7 +344,9 @@
 
     Represents wxColour and a system colour index. wxChoice is used to edit
     the value. Drop-down list has color images. Note that value type
 
     Represents wxColour and a system colour index. wxChoice is used to edit
     the value. Drop-down list has color images. Note that value type

-    is wxColourPropertyValue instead of wxColour.
+    is wxColourPropertyValue instead of wxColour (which wxColourProperty
+    uses).
+

     @code
         class wxColourPropertyValue : public wxObject
         {
     @code
         class wxColourPropertyValue : public wxObject
         {


@@ -324,6 +364,27 @@
         };
     @endcode
 
         };
     @endcode
 

+    in wxSystemColourProperty, and its derived class wxColourProperty, there
+    are various sub-classing features. To set basic list list of colour
+    names, call wxPGProperty::SetChoices().
+
+    @code
+        // Override in derived class to customize how colours are translated
+        // to strings.
+        virtual wxString ColourToString( const wxColour& col, int index ) const;
+
+        // Returns index of entry that triggers colour picker dialog
+        // (default is last).
+        virtual int GetCustomColourIndex() const;
+
+        // Helper function to show the colour dialog
+        bool QueryColourFromUser( wxVariant& variant ) const;
+
+        // Returns colour for given choice.
+        // Default function returns wxSystemSettings::GetColour(index).
+        virtual wxColour GetColour( int index ) const;
+    @endcode
+

     @subsection wxCursorProperty
 
     Represents a wxCursor. wxChoice is used to edit the value.
     @subsection wxCursorProperty
 
     Represents a wxCursor. wxChoice is used to edit the value.


@@ -366,9 +427,10 @@
                 return wxPGEditor_TextCtrl;
             }
 
                 return wxPGEditor_TextCtrl;
             }
 

-            virtual wxString GetValueAsString( int argFlags ) const
+            virtual wxString ValueToString( wxVariant& value,
+                                            int argFlags ) const

             {
             {

-                // TODO: Return property value in string format
+                // TODO: Convert given property value to a string

             }
 
             virtual bool StringToValue( wxVariant& variant, const wxString& text, int argFlags )
             }
 
             virtual bool StringToValue( wxVariant& variant, const wxString& text, int argFlags )


@@ -412,18 +474,18 @@ class wxPGProperty : public wxObject
 public:
     typedef wxUint32 FlagType;
 
 public:
     typedef wxUint32 FlagType;
 

-    /** Basic constructor.
+    /**
+        Default constructor.

     */
     wxPGProperty();
 
     */
     wxPGProperty();
 

-    /** Constructor.
+    /**
+        Constructor.

         Non-abstract property classes should have constructor of this style:
 
         @code
 
         Non-abstract property classes should have constructor of this style:
 
         @code
 

-        // If T is a class, then it should be a constant reference
-        // (e.g. const T& ) instead.
-        MyProperty( const wxString& label, const wxString& name, T value )
+        MyProperty( const wxString& label, const wxString& name, const T& value )

             : wxPGProperty()
         {
             // Generally recommended way to set the initial value
             : wxPGProperty()
         {
             // Generally recommended way to set the initial value


@@ -440,10 +502,13 @@ public:
     */
     wxPGProperty( const wxString& label, const wxString& name );
 
     */
     wxPGProperty( const wxString& label, const wxString& name );
 

-    /** Virtual destructor. It is customary for derived properties to implement this. */
+    /**
+        Virtual destructor. It is customary for derived properties to implement this.
+    */

     virtual ~wxPGProperty();
 
     virtual ~wxPGProperty();
 

-    /** This virtual function is called after m_value has been set.
+    /**
+        This virtual function is called after m_value has been set.

 
         @remarks
         - If m_value was set to Null variant (ie. unspecified value), OnSetValue()
 
         @remarks
         - If m_value was set to Null variant (ie. unspecified value), OnSetValue()


@@ -455,89 +520,128 @@ public:
     */
     virtual void OnSetValue();
 
     */
     virtual void OnSetValue();
 

-    /** Override this to return something else than m_value as the value.
+    /**
+        Override this to return something else than m_value as the value.

     */
     */

-    virtual wxVariant DoGetValue() const { return m_value; }
+    virtual wxVariant DoGetValue() const;

 
 

-    /** Implement this function in derived class to check the value.
-        Return true if it is ok. Returning false prevents property change events
+    /**
+        Implement this function in derived class to check the value.
+        Return @true if it is ok. Returning @false prevents property change events

         from occurring.
 
         @remarks
         from occurring.
 
         @remarks

-        - Default implementation always returns true.
+        - Default implementation always returns @true.

     */
     virtual bool ValidateValue( wxVariant& value, wxPGValidationInfo& validationInfo ) const;
 
     */
     virtual bool ValidateValue( wxVariant& value, wxPGValidationInfo& validationInfo ) const;
 

-    /** Converts 'text' into proper value 'variant'. Returns true if new (different than
-        m_value) value could be interpreted from the text.
+    /**
+        Converts text into wxVariant value appropriate for this property.
+
+        @param variant
+            On function entry this is the old value (should not be wxNullVariant
+            in normal cases). Translated value must be assigned back to it.
+
+        @param text
+            Text to be translated into variant.
+

         @param argFlags
         @param argFlags

-        If wxPG_FULL_VALUE is set, returns complete, storable value instead of displayable
-        one (they may be different).
-        If wxPG_COMPOSITE_FRAGMENT is set, text is interpreted as a part of composite
-        property string value (as generated by GetValueAsString() called with this same
-        flag).
+            If wxPG_FULL_VALUE is set, returns complete, storable value instead
+            of displayable one (they may be different).
+            If wxPG_COMPOSITE_FRAGMENT is set, text is interpreted as a part of
+            composite property string value (as generated by ValueToString()
+            called with this same flag).

 
 

-        @remarks
-        Default implementation converts semicolon delimited tokens into child values. Only
-        works for properties with children.
+        @return Returns @true if resulting wxVariant value was different.
+
+        @remarks Default implementation converts semicolon delimited tokens into
+                child values. Only works for properties with children.
+
+                You might want to take into account that m_value is Null variant
+                if property value is unspecified (which is usually only case if
+                you explicitly enabled that sort behavior).

     */
     virtual bool StringToValue( wxVariant& variant, const wxString& text, int argFlags = 0 ) const;
 
     */
     virtual bool StringToValue( wxVariant& variant, const wxString& text, int argFlags = 0 ) const;
 

-    /** Converts 'number' (including choice selection) into proper value 'variant'.
-        Returns true if new (different than m_value) value could be interpreted from the integer.
+    /**
+        Converts integer (possibly a choice selection) into wxVariant value
+        appropriate for this property.
+
+        @param variant
+            On function entry this is the old value (should not be wxNullVariant
+            in normal cases). Translated value must be assigned back to it.
+        @param number
+            Integer to be translated into variant.

         @param argFlags
         @param argFlags

-        If wxPG_FULL_VALUE is set, returns complete, storable value instead of displayable one.
+            If wxPG_FULL_VALUE is set, returns complete, storable value instead
+            of displayable one.
+
+        @return Returns @true if resulting wxVariant value was different.

 
         @remarks
         - If property is not supposed to use choice or spinctrl or other editor
           with int-based value, it is not necessary to implement this method.
         - Default implementation simply assign given int to m_value.
 
         @remarks
         - If property is not supposed to use choice or spinctrl or other editor
           with int-based value, it is not necessary to implement this method.
         - Default implementation simply assign given int to m_value.

-        - If property uses choice control, and displays a dialog on some choice items,
-          then it is preferred to display that dialog in IntToValue instead of OnEvent.
+        - If property uses choice control, and displays a dialog on some choice
+          items, then it is preferred to display that dialog in IntToValue
+          instead of OnEvent.
+        - You might want to take into account that m_value is Mull variant if
+          property value is unspecified (which is usually only case if you
+          explicitly enabled that sort behavior).

     */
     */

-    virtual bool IntToValue( wxVariant& value, int number, int argFlags = 0 ) const;
+    virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const;

 
 

-public:
-
-    /** Returns text representation of property's value.
+    /**
+        Converts property value into a text representation.

 
 

+        @param value
+            Value to be converted.

         @param argFlags
         @param argFlags

-        If wxPG_FULL_VALUE is set, returns complete, storable string value instead of displayable.
-        If wxPG_EDITABLE_VALUE is set, returns string value that must be editable in textctrl.
-        If wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to display
-        as a part of composite property string value.
+            If 0 (default value), then displayed string is returned.
+            If wxPG_FULL_VALUE is set, returns complete, storable string value
+            instead of displayable. If wxPG_EDITABLE_VALUE is set, returns
+            string value that must be editable in textctrl.
+            If wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
+            display as a part of string property's composite text representation.

 
 

-        @remarks
-        Default implementation returns string composed from text representations of
-        child properties.
+        @remarks Default implementation calls GenerateComposedValue().

     */
     */

-    virtual wxString GetValueAsString( int argFlags = 0 ) const;
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;

 
 

-    /** Converts string to a value, and if successful, calls SetValue() on it.
+    /**
+        Converts string to a value, and if successful, calls SetValue() on it.

         Default behavior is to do nothing.
         Default behavior is to do nothing.

+

         @param text
         @param text

-        String to get the value from.
-        @retval
-        true if value was changed.
+            String to get the value from.
+        @param flags
+            @todo docme
+
+        @return @true if value was changed.

     */
     bool SetValueFromString( const wxString& text, int flags = 0 );
 
     */
     bool SetValueFromString( const wxString& text, int flags = 0 );
 

-    /** Converts integer to a value, and if succesful, calls SetValue() on it.
+    /**
+        Converts integer to a value, and if succesful, calls SetValue() on it.

         Default behavior is to do nothing.
         Default behavior is to do nothing.

+

         @param value
         @param value

-        Int to get the value from.
+            Int to get the value from.

         @param flags
         @param flags

-        If has wxPG_FULL_VALUE, then the value given is a actual value and not an index.
-        @retval
-        True if value was changed.
+            If has wxPG_FULL_VALUE, then the value given is a actual value and not an index.
+
+        @return @true if value was changed.

     */
     bool SetValueFromInt( long value, int flags = 0 );
 
     */
     bool SetValueFromInt( long value, int flags = 0 );
 

-    /** Returns size of the custom painted image in front of property. This method
+    /**
+        Returns size of the custom painted image in front of property. This method

         must be overridden to return non-default value if OnCustomPaint is to be
         called.
         must be overridden to return non-default value if OnCustomPaint is to be
         called.

+

         @param item
         @param item

-        Normally -1, but can be an index to the property's list of items.
+            Normally -1, but can be an index to the property's list of items.
+

         @remarks
         - Default behavior is to return wxSize(0,0), which means no image.
         - Default image width or height is indicated with dimension -1.
         @remarks
         - Default behavior is to return wxSize(0,0), which means no image.
         - Default image width or height is indicated with dimension -1.


@@ -545,27 +649,30 @@ public:
     */
     virtual wxSize OnMeasureImage( int item = -1 ) const;
 
     */
     virtual wxSize OnMeasureImage( int item = -1 ) const;
 

-    /** Events received by editor widgets are processed here. Note that editor class
+    /**
+        Events received by editor widgets are processed here. Note that editor class

         usually processes most events. Some, such as button press events of
         TextCtrlAndButton class, can be handled here. Also, if custom handling
         for regular events is desired, then that can also be done (for example,
         wxSystemColourProperty custom handles wxEVT_COMMAND_CHOICE_SELECTED
         to display colour picker dialog when 'custom' selection is made).
 
         usually processes most events. Some, such as button press events of
         TextCtrlAndButton class, can be handled here. Also, if custom handling
         for regular events is desired, then that can also be done (for example,
         wxSystemColourProperty custom handles wxEVT_COMMAND_CHOICE_SELECTED
         to display colour picker dialog when 'custom' selection is made).
 

-        If the event causes value to be changed, SetValueInEvent()
-        should be called to set the new value.
+        If the event causes value to be changed, SetValueInEvent() should be called
+        to set the new value.
+
+        The parameter @a event is the associated wxEvent.

 
 

-        @param event
-        Associated wxEvent.

         @retval
         @retval

-        Should return true if any changes in value should be reported.
+            Should return @true if any changes in value should be reported.
+

         @remarks
         - If property uses choice control, and displays a dialog on some choice items,
           then it is preferred to display that dialog in IntToValue instead of OnEvent.
     */
     virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* wnd_primary, wxEvent& event );
 
         @remarks
         - If property uses choice control, and displays a dialog on some choice items,
           then it is preferred to display that dialog in IntToValue instead of OnEvent.
     */
     virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* wnd_primary, wxEvent& event );
 

-    /** Called after value of a child property has been altered. Note that this function is
+    /**
+        Called after value of a child property has been altered. Note that this function is

         usually called at the time that value of this property, or given child property, is
         still pending for change.
 
         usually called at the time that value of this property, or given child property, is
         still pending for change.
 


@@ -594,20 +701,22 @@ public:
         @endcode
 
         @param thisValue
         @endcode
 
         @param thisValue

-        Value of this property, that should be altered.
+            Value of this property, that should be altered.

         @param childIndex
         @param childIndex

-        Index of child changed (you can use Item(childIndex) to get).
+            Index of child changed (you can use Item(childIndex) to get).

         @param childValue
         @param childValue

-        Value of the child property.
+            Value of the child property.

     */
     virtual void ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const;
 
     */
     virtual void ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const;
 

-    /** Returns pointer to an instance of used editor.
+    /**
+        Returns pointer to an instance of used editor.

     */
     virtual const wxPGEditor* DoGetEditorClass() const;
 
     */
     virtual const wxPGEditor* DoGetEditorClass() const;
 

-    /** Returns pointer to the wxValidator that should be used
-        with the editor of this property (NULL for no validator).
+    /**
+        Returns pointer to the wxValidator that should be used
+        with the editor of this property (@NULL for no validator).

         Setting validator explicitly via SetPropertyValidator
         will override this.
 
         Setting validator explicitly via SetPropertyValidator
         will override this.
 


@@ -638,7 +747,8 @@ public:
     */
     virtual wxValidator* DoGetValidator () const;
 
     */
     virtual wxValidator* DoGetValidator () const;
 

-    /** Override to paint an image in front of the property value text or drop-down
+    /**
+        Override to paint an image in front of the property value text or drop-down

         list item (but only if wxPGProperty::OnMeasureImage is overridden as well).
 
         If property's OnMeasureImage() returns size that has height != 0 but less than
         list item (but only if wxPGProperty::OnMeasureImage is overridden as well).
 
         If property's OnMeasureImage() returns size that has height != 0 but less than


@@ -689,17 +799,19 @@ public:
             - Pen is guaranteed to be 1-wide 'black' (or whatever is the proper colour) pen for
               drawing framing rectangle. It can be changed as well.
 
             - Pen is guaranteed to be 1-wide 'black' (or whatever is the proper colour) pen for
               drawing framing rectangle. It can be changed as well.
 

-        @see GetValueAsString()
+        @see ValueToString()

     */
     virtual void OnCustomPaint( wxDC& dc, const wxRect& rect, wxPGPaintData& paintdata );
 
     */
     virtual void OnCustomPaint( wxDC& dc, const wxRect& rect, wxPGPaintData& paintdata );
 

-    /** Returns used wxPGCellRenderer instance for given property column (label=0, value=1).
+    /**
+        Returns used wxPGCellRenderer instance for given property column (label=0, value=1).

 
         Default implementation returns editor's renderer for all columns.
     */
     virtual wxPGCellRenderer* GetCellRenderer( int column ) const;
 
 
         Default implementation returns editor's renderer for all columns.
     */
     virtual wxPGCellRenderer* GetCellRenderer( int column ) const;
 

-    /** Returns which choice is currently selected. Only applies to properties
+    /**
+        Returns which choice is currently selected. Only applies to properties

         which have choices.
 
         Needs to reimplemented in derived class if property value does not
         which have choices.
 
         Needs to reimplemented in derived class if property value does not


@@ -707,49 +819,41 @@ public:
     */
     virtual int GetChoiceSelection() const;
 
     */
     virtual int GetChoiceSelection() const;
 

-    /** Refresh values of child properties. Automatically called after value is set.
+    /**
+        Refresh values of child properties. Automatically called after value is set.

     */
     virtual void RefreshChildren();
 
     */
     virtual void RefreshChildren();
 

-    /** Special handling for attributes of this property.
+    /**
+        Special handling for attributes of this property.

 
 

-        If returns false, then the attribute will be automatically stored in
+        If returns @false, then the attribute will be automatically stored in

         m_attributes.
 
         m_attributes.
 

-        Default implementation simply returns false.
+        Default implementation simply returns @false.

     */
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
 
     */
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
 

-    /** Returns value of an attribute.
+    /**
+        Returns value of an attribute.

 
         Override if custom handling of attributes is needed.
 
 
         Override if custom handling of attributes is needed.
 

-        Default implementation simply return NULL variant.
+        Default implementation simply return @NULL variant.

     */
     virtual wxVariant DoGetAttribute( const wxString& name ) const;
 
     */
     virtual wxVariant DoGetAttribute( const wxString& name ) const;
 

-    /** Returns instance of a new wxPGEditorDialogAdapter instance, which is
+    /**
+        Returns instance of a new wxPGEditorDialogAdapter instance, which is

         used when user presses the (optional) button next to the editor control;
 
         used when user presses the (optional) button next to the editor control;
 

-        Default implementation returns NULL (ie. no action is generated when
+        Default implementation returns @NULL (ie. no action is generated when

         button is pressed).
     */
     virtual wxPGEditorDialogAdapter* GetEditorDialog() const;
 
         button is pressed).
     */
     virtual wxPGEditorDialogAdapter* GetEditorDialog() const;
 

-    /** Returns wxPGCell of given column, NULL if none. If valid
-        object is returned, caller will gain its ownership.
-    */
-    wxPGCell* AcquireCell( unsigned int column )
-    {
-        if ( column >= m_cells.size() )
-            return NULL;
-
-        wxPGCell* cell = (wxPGCell*) m_cells[column];
-        m_cells[column] = NULL;
-        return cell;
-    }
-
-    /** Append a new choice to property's list of choices.
+    /**
+        Append a new choice to property's list of choices.

 
         @param label
             Label for added choice.
 
         @param label
             Label for added choice.


@@ -763,544 +867,546 @@ public:
     */
     int AddChoice( const wxString& label, int value = wxPG_INVALID_VALUE );
 
     */
     int AddChoice( const wxString& label, int value = wxPG_INVALID_VALUE );
 

-    /** Returns true if children of this property are component values (for instance,
-        points size, face name, and is_underlined are component values of a font).
+    /**
+        Adds a child property. If you use this instead of
+        wxPropertyGridInterface::Insert() or
+        wxPropertyGridInterface::AppendIn(), then you must set up
+        property's parental type before making the call. To do this,
+        call property's SetParentalType() function with either
+        wxPG_PROP_MISC_PARENT (normal, public children) or with
+        wxPG_PROP_AGGREGATE (private children for subclassed property).
+        For instance:
+
+        @code
+            wxPGProperty* prop = new wxStringProperty(wxS("Property"));
+            prop->SetParentalType(wxPG_PROP_MISC_PARENT);
+            wxPGProperty* prop2 = new wxStringProperty(wxS("Property2"));
+            prop->AddChild(prop2);
+        @endcode

     */
     */

-    bool AreChildrenComponents() const
-    {
-        if ( m_flags & (wxPG_PROP_COMPOSED_VALUE|wxPG_PROP_AGGREGATE) )
-            return true;
+    void AddChild( wxPGProperty* property );

 
 

-        return false;
-    }
+    /**
+        Adapts list variant into proper value using consecutive
+        ChildChanged() calls.
+    */
+    void AdaptListToValue( wxVariant& list, wxVariant* value ) const;

 
 

-    /** Removes entry from property's wxPGChoices and editor control (if it is active).
+    /**
+        Determines, recursively, if all children are not unspecified.

 
 

-        If selected item is deleted, then the value is set to unspecified.
+        @param pendingList
+            Assumes members in this wxVariant list as pending
+            replacement values.

     */
     */

-    void DeleteChoice( int index );
+    bool AreAllChildrenSpecified( wxVariant* pendingList = NULL ) const;

 
 

-    /** Composes text from values of child properties. */
-    void GenerateComposedValue( wxString& text, int argFlags = 0 ) const;
+    /**
+        Returns @true if children of this property are component values (for instance,
+        points size, face name, and is_underlined are component values of a font).
+    */
+    bool AreChildrenComponents() const;

 
 

-    /** Returns property's label. */
-    const wxString& GetLabel() const { return m_label; }
+    /**
+        Removes entry from property's wxPGChoices and editor control (if it is active).

 
 

-    /** Returns property's name with all (non-category, non-root) parents. */
-    wxString GetName() const;
+        If selected item is deleted, then the value is set to unspecified.
+    */
+    void DeleteChoice( int index );

 
 

-    /** Returns property's base name (ie. parent's name is not added in any case) */
-    const wxString& GetBaseName() const { return m_name; }
+    /** Deletes all child properties. */
+    void Empty();

 
 

-    /** Returns read-only reference to property's list of choices.
+    /**
+        Composes text from values of child properties.

     */
     */

-    const wxPGChoices& GetChoices() const;
+    wxString GenerateComposedValue() const;

 
 

-    /** Returns coordinate to the top y of the property. Note that the
-        position of scrollbars is not taken into account.
+    /**
+        Returns property attribute value, null variant if not found.

     */
     */

-    int GetY() const;
-
-    wxVariant GetValue() const
-    {
-        return DoGetValue();
-    }
+    wxVariant GetAttribute( const wxString& name ) const;

 
 

-    /** Returns reference to the internal stored value. GetValue is preferred
-        way to get the actual value, since GetValueRef ignores DoGetValue,
-        which may override stored value.
+    /** Returns named attribute, as string, if found. Otherwise defVal is returned.

     */
     */

-    wxVariant& GetValueRef()
-    {
-        return m_value;
-    }
-
-    const wxVariant& GetValueRef() const
-    {
-        return m_value;
-    }
+    wxString GetAttribute( const wxString& name, const wxString& defVal ) const;

 
 

-    /** To acquire property's value as string, you should use this
-         function (instead of GetValueAsString()), as it may produce
-         more accurate value in future versions.
+    /** Returns named attribute, as long, if found. Otherwise defVal is returned.

     */
     */

-    wxString GetValueString( int argFlags = 0 ) const;
-
-    void UpdateControl( wxWindow* primary );
+    long GetAttributeAsLong( const wxString& name, long defVal ) const;

 
 

-    /** Returns wxPGCell of given column, NULL if none. wxPGProperty
-        will retain ownership of the cell object.
+    /** Returns named attribute, as double, if found. Otherwise defVal is returned.

     */
     */

-    wxPGCell* GetCell( unsigned int column ) const
-    {
-        if ( column >= m_cells.size() )
-            return NULL;
+    double GetAttributeAsDouble( const wxString& name, double defVal ) const;

 
 

-        return (wxPGCell*) m_cells[column];
-    }
+    /**
+        Returns attributes as list wxVariant.
+    */
+    wxVariant GetAttributesAsList() const;

 
 

-    /** Returns property's displayed text.
-     */
-    wxString GetDisplayedString() const
-    {
-        return GetValueString(0);
-    }
+    /**
+        Returns editor used for given column. @NULL for no editor.
+    */
+    const wxPGEditor* GetColumnEditor( int column ) const;

 
 

-    /** Returns property grid where property lies. */
-    wxPropertyGrid* GetGrid() const;
+    /** Returns property's base name (ie. parent's name is not added in any case) */
+    const wxString& GetBaseName() const;

 
 

-    /** Returns owner wxPropertyGrid, but only if one is currently on a page
-        displaying this property. */
-    wxPropertyGrid* GetGridIfDisplayed() const;
+    /**
+        Returns wxPGCell of given column.
+    */
+    const wxPGCell& GetCell( unsigned int column ) const;

 
 

-    /** Returns highest level non-category, non-root parent. Useful when you
-        have nested wxCustomProperties/wxParentProperties.
-        @remarks
-        Thus, if immediate parent is root or category, this will return the
-        property itself.
+    /**
+        Returns number of child properties.

     */
     */

-    wxPGProperty* GetMainParent() const;
+    unsigned int GetChildCount() const;

 
 

-    /** Return parent of property */
-    wxPGProperty* GetParent() const { return m_parent; }
+    /**
+        Returns height of children, recursively, and
+        by taking expanded/collapsed status into account.

 
 

-    /** Returns true if property has editable wxTextCtrl when selected.
+        @param lh
+            Line height. Pass result of GetGrid()->GetRowHeight() here.

 
 

-        @remarks
-        Altough disabled properties do not displayed editor, they still
-        return True here as being disabled is considered a temporary
-        condition (unlike being read-only or having limited editing enabled).
+        @param iMax
+            Only used (internally) when finding property y-positions.

     */
     */

-    bool IsTextEditable() const;
+    int GetChildrenHeight( int lh, int iMax = -1 ) const;

 
 

-    bool IsValueUnspecified() const
-    {
-        return m_value.IsNull();
-    }
+    /**
+        Returns read-only reference to property's list of choices.
+    */
+    const wxPGChoices& GetChoices() const;

 
 

-    FlagType HasFlag( FlagType flag ) const
-    {
-        return ( m_flags & flag );
-    }
+    /**
+        Returns client data (void*) of a property.
+    */
+    void* GetClientData() const;

 
 

-    /** Returns comma-delimited string of property attributes.
+    /** Sets managed client object of a property.

     */
     */

-    const wxPGAttributeStorage& GetAttributes() const
-    {
-        return m_attributes;
-    }
+    wxClientData *GetClientObject() const;

 
 

-    /** Returns m_attributes as list wxVariant.
+    /**
+        Returns property's default value. If property's value type is not
+        a built-in one, and "DefaultValue" attribute is not defined, then
+        this function usually returns Null variant.

     */
     */

-    wxVariant GetAttributesAsList() const;
+    wxVariant GetDefaultValue() const;

 
 

-    FlagType GetFlags() const
-    {
-        return m_flags;
-    }
+    /** Returns property's displayed text.
+    */
+    wxString GetDisplayedString() const;

 
 

+    /**
+        Returns wxPGEditor that will be used and created when
+        property becomes selected. Returns more accurate value
+        than DoGetEditorClass().
+    */

     const wxPGEditor* GetEditorClass() const;
 
     const wxPGEditor* GetEditorClass() const;
 

-    wxString GetValueType() const
-    {
-        return m_value.GetType();
-    }
+    /** Returns property grid where property lies. */
+    wxPropertyGrid* GetGrid() const;

 
 

-    /** Returns editor used for given column. NULL for no editor.
+    /**
+        Returns owner wxPropertyGrid, but only if one is currently on a page
+        displaying this property.

     */
     */

-    const wxPGEditor* GetColumnEditor( int column ) const
-    {
-        if ( column == 1 )
-            return GetEditorClass();
+    wxPropertyGrid* GetGridIfDisplayed() const;

 
 

-        return NULL;
-    }
+    /**
+        Returns property's help or description text.

 
 

-    /** Returns true if property has even one visible child.
+        @see SetHelpString()

     */
     */

-    bool HasVisibleChildren() const;
-
-    /** Inserts a new choice to property's list of choices.
+    const wxString& GetHelpString() const;

 
 

-        @param label
-            Text for new choice
+    /**
+        Returns position in parent's array.
+    */
+    unsigned int GetIndexInParent() const;

 
 

-        @param index
-            Insertion position. Use wxNOT_FOUND to append.
+    /** Returns property's label. */
+    const wxString& GetLabel() const;

 
 

-        @param value
-            Value for new choice. Do not specify if you wish this
-            to equal choice index.
+    /**
+        Returns last visible child property, recursively.

     */
     */

-    int InsertChoice( const wxString& label, int index, int value = wxPG_INVALID_VALUE );
+    const wxPGProperty* GetLastVisibleSubItem() const;

 
 

-    /** Returns true if this property is actually a wxPropertyCategory.
-    */
-    bool IsCategory() const { return HasFlag(wxPG_PROP_CATEGORY)?true:false; }
+    /**
+        Returns highest level non-category, non-root parent. Useful when you
+        have nested properties with children.

 
 

-    /** Returns true if this property is actually a wxRootProperty.
+        @remarks If immediate parent is root or category, this will return the
+                property itself.

     */
     */

-    bool IsRoot() const { return (m_parent == NULL); }
-
-    /** Returns true if this is a sub-property. */
-    bool IsSubProperty() const
-    {
-        wxPGProperty* parent = (wxPGProperty*)m_parent;
-        if ( parent && !parent->IsCategory() )
-            return true;
-        return false;
-    }
+    wxPGProperty* GetMainParent() const;

 
 

-    /** Returns last visible sub-property, recursively.
+    /** Returns maximum allowed length of property's text value.

     */
     */

-    const wxPGProperty* GetLastVisibleSubItem() const;
+    int GetMaxLength() const;

 
 

-    wxVariant GetDefaultValue() const;
+    /** Returns property's name with all (non-category, non-root) parents. */
+    wxString GetName() const;

 
 

-    int GetMaxLength() const
-    {
-        return (int) m_maxLen;
-    }
+    /** Return parent of property */
+    wxPGProperty* GetParent() const;

 
 

-    /** Determines, recursively, if all children are not unspecified. Takes values in given list into account.
+    /**
+        Returns (direct) child property with given name (or @NULL if not found).

     */
     */

-    bool AreAllChildrenSpecified( wxVariant* pendingList = NULL ) const;
+    wxPGProperty* GetPropertyByName( const wxString& name ) const;

 
 

-    /** Updates composed values of parent non-category properties, recursively.
-        Returns topmost property updated.
+    /** Gets assignable version of property's validator. */
+    wxValidator* GetValidator() const;

 
 

-        @remarks
-        - Must not call SetValue() (as can be called in it).
+    /**
+        Returns property's value.

     */
     */

-    wxPGProperty* UpdateParentValues();
+    wxVariant GetValue() const;

 
 

-    /** Returns true if containing grid uses wxPG_EX_AUTO_UNSPECIFIED_VALUES.
+    /**
+        Returns bitmap that appears next to value text. Only returns non-@NULL
+        bitmap if one was set with SetValueImage().

     */
     */

-    FlagType UsesAutoUnspecified() const
-    {
-        return HasFlag(wxPG_PROP_AUTO_UNSPECIFIED);
-    }
-
-    wxBitmap* GetValueImage() const
-    {
-        return m_valueBitmap;
-    }
+    wxBitmap* GetValueImage() const;

 
 

-    wxVariant GetAttribute( const wxString& name ) const;
+    /** Returns text representation of property's value.

 
 

-    /** Returns named attribute, as string, if found. Otherwise defVal is returned.
+        @param argFlags
+            If 0 (default value), then displayed string is returned.
+            If wxPG_FULL_VALUE is set, returns complete, storable string value
+            instead of displayable. If wxPG_EDITABLE_VALUE is set, returns
+            string value that must be editable in textctrl. If
+            wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
+            display as a part of string property's composite text
+            representation.
+
+        @remarks In older versions, this function used to be overridden to convert
+                 property's value into a string representation. This function is
+                 now handled by ValueToString(), and overriding this function now
+                 will result in run-time assertion failure.

     */
     */

-    wxString GetAttribute( const wxString& name, const wxString& defVal ) const;
+    virtual wxString GetValueAsString( int argFlags = 0 ) const;

 
 

-    /** Returns named attribute, as long, if found. Otherwise defVal is returned.
-    */
-    long GetAttributeAsLong( const wxString& name, long defVal ) const;
+    /** Synonymous to GetValueAsString().

 
 

-    /** Returns named attribute, as double, if found. Otherwise defVal is returned.
+        @deprecated Use GetValueAsString() instead.
+
+        @see GetValueAsString()

     */
     */

-    double GetAttributeAsDouble( const wxString& name, double defVal ) const;
+    wxDEPRECATED( wxString GetValueString( int argFlags = 0 ) const );

 
 

-    inline unsigned int GetArrIndex() const { return m_arrIndex; }
+    /**
+        Returns value type used by this property.
+    */
+    wxString GetValueType() const;

 
 

-    inline unsigned int GetDepth() const { return (unsigned int)m_depth; }
+    /**
+        Returns coordinate to the top y of the property. Note that the
+        position of scrollbars is not taken into account.
+    */
+    int GetY() const;

 
 

-    /** Gets flags as a'|' delimited string. Note that flag names are not
-        prepended with 'wxPG_PROP_'.
-        @param flagsMask
-        String will only be made to include flags combined by this parameter.
+    /**
+        Returns @true if property has even one visible child.

     */
     */

-    wxString GetFlagsAsString( FlagType flagsMask ) const;
+    bool HasVisibleChildren() const;

 
 

-    /** Returns position in parent's array. */
-    unsigned int GetIndexInParent() const
-    {
-        return (unsigned int)m_arrIndex;
-    }
+    /**
+        Hides or reveals the property.

 
 

-    /** Hides or reveals the property.

         @param hide
         @param hide

-        true for hide, false for reveal.
+            @true for hide, @false for reveal.
+

         @param flags
         @param flags

-        By default changes are applied recursively. Set this paramter wxPG_DONT_RECURSE to prevent this.
+            By default changes are applied recursively. Set this parameter wxPG_DONT_RECURSE to prevent this.

     */
     */

-    inline bool Hide( bool hide, int flags = wxPG_RECURSE );
-
-    bool IsExpanded() const { return (!(m_flags & wxPG_PROP_COLLAPSED) && GetChildCount()); }
+    bool Hide( bool hide, int flags = wxPG_RECURSE );

 
 

-    /** Returns true if all parents expanded.
+    /**
+        Returns index of given child property. wxNOT_FOUND if
+        given property is not child of this.

     */
     */

-    bool IsVisible() const;
+    int Index( const wxPGProperty* p ) const;

 
 

-    bool IsEnabled() const
-    {
-        return ( m_flags & wxPG_PROP_DISABLED ) ? false : true;
-    }
+    /**
+        Inserts a new choice to property's list of choices.

 
 

-    /** If property's editor is created this forces its recreation. Useful
-        in SetAttribute etc. Returns true if actually did anything.
-    */
-    bool RecreateEditor();
+        @param label
+            Text for new choice

 
 

-    /** If property's editor is active, then update it's value.
-    */
-    void RefreshEditor();
+        @param index
+            Insertion position. Use wxNOT_FOUND to append.

 
 

-    /** Sets an attribute for this property.
-        @param name
-        Text identifier of attribute. See @ref propgrid_property_attributes.

         @param value
         @param value

-        Value of attribute.
+            Value for new choice. Do not specify if you wish this
+            to equal choice index.

     */
     */

-    void SetAttribute( const wxString& name, wxVariant value );
-
-    void SetAttributes( const wxPGAttributeStorage& attributes );
-
-    /** Sets editor for a property.
-
-        @param editor
-        For builtin editors, use wxPGEditor_X, where X is builtin editor's
-        name (TextCtrl, Choice, etc. see wxPGEditor documentation for full list).
+    int InsertChoice( const wxString& label, int index, int value = wxPG_INVALID_VALUE );

 
 

-        For custom editors, use pointer you received from wxPropertyGrid::RegisterEditorClass().
+    /**
+        Returns @true if this property is actually a wxPropertyCategory.

     */
     */

-    void SetEditor( const wxPGEditor* editor )
-    {
-        m_customEditor = editor;
-    }
+    bool IsCategory() const;

 
 

-    /** Sets editor for a property.
+    /**
+        Returns @true if property is enabled.

     */
     */

-    inline void SetEditor( const wxString& editorName );
+    bool IsEnabled() const;

 
 

-    /** Sets cell information for given column.
+    /**
+        Returns @true if property has visible children.
+    */
+    bool IsExpanded() const;

 
 

-        Note that the property takes ownership of given wxPGCell instance.
+    /**
+        Returns @true if this property is actually a wxRootProperty.

     */
     */

-    void SetCell( int column, wxPGCell* cellObj );
+    bool IsRoot() const;

 
 

-    /** If property has choices and they are not yet exclusive, new such copy
-        of them will be created.
+    /**
+        Returns @true if candidateParent is some parent of this property.

     */
     */

-    void SetChoicesExclusive();
+    bool IsSomeParent( wxPGProperty* candidateParent ) const;

 
 

-    /** Sets selected choice and changes property value.
+    /**
+        Returns true if property has editable wxTextCtrl when selected.

 
 

-        Tries to retain value type, although currently if it is not string,
-        then it is forced to integer.
+        @remarks Altough disabled properties do not displayed editor, they still
+                return @true here as being disabled is considered a temporary
+                condition (unlike being read-only or having limited editing enabled).

     */
     */

-    void SetChoiceSelection( int newValue );
+    bool IsTextEditable() const;

 
 

-    /** Sets flags from a '|' delimited string. Note that flag names are not
-        prepended with 'wxPG_PROP_'.
+    /**
+        Returns @true if property's value is considered unspecified. This
+        usually means that value is Null variant.

     */
     */

-    void SetFlagsFromString( const wxString& str );
+    bool IsValueUnspecified() const;

 
 

-    /** Sets property's "is it modified?" flag. Affects children recursively.
+    /**
+        Returns true if all parents expanded.

     */
     */

-    void SetModifiedStatus( bool modified )
-    {
-        SetFlagRecursively(wxPG_PROP_MODIFIED, modified);
-    }
-
-    /** Call in OnEvent(), OnButtonClick() etc. to change the property value
-        based on user input.
+    bool IsVisible() const;

 
 

-        @remarks
-        This method is const since it doesn't actually modify value, but posts
-        given variant as pending value, stored in wxPropertyGrid.
+    /**
+        Returns child property at index i.

     */
     */

-    void SetValueInEvent( wxVariant value ) const;
+    wxPGProperty* Item( unsigned int i ) const;

 
 

-    /** Call this to set value of the property. Unlike methods in wxPropertyGrid,
-        this does not automatically update the display.
+    /**
+        If property's editor is active, then update it's value.
+    */
+    void RefreshEditor();

 
 

-        @remarks
-        Use wxPropertyGrid::ChangePropertyValue() instead if you need to run through
-        validation process and send property change event.
+    /**
+        Sets an attribute for this property.

 
 

-        If you need to change property value in event, based on user input, use
-        SetValueInEvent() instead.
+        @param name
+            Text identifier of attribute. See @ref propgrid_property_attributes.

 
 

-        @param pList
-        Pointer to list variant that contains child values. Used to indicate
-        which children should be marked as modified.
-        @param flags
-        Various flags (for instance, wxPG_SETVAL_REFRESH_EDITOR).
-    */
-    void SetValue( wxVariant value, wxVariant* pList = NULL, int flags = 0 );
+        @param value
+            Value of attribute.

 
 

-    /** Set wxBitmap in front of the value. This bitmap may be ignored
-        by custom cell renderers.
+        @remarks Setting attribute's value to Null variant will simply remove it
+                from property's set of attributes.

     */
     */

-    void SetValueImage( wxBitmap& bmp );
+    void SetAttribute( const wxString& name, wxVariant value );

 
 

-    void SetExpanded( bool expanded )
-    {
-        if ( !expanded ) m_flags |= wxPG_PROP_COLLAPSED;
-        else m_flags &= ~wxPG_PROP_COLLAPSED;
-    }
+    /**
+        Sets property's background colour.

 
 

-    void SetFlag( FlagType flag ) { m_flags |= flag; }
+        @param colour
+            Background colour to use.

 
 

-    void SetFlagRecursively( FlagType flag, bool set );
+        @param recursively
+            If @true, children are affected recursively, and any categories
+            are not.
+    */
+    void SetBackgroundColour( const wxColour& colour,
+                              bool recursively = false );

 
 

-    void SetHelpString( const wxString& helpString )
-    {
-        m_helpString = helpString;
-    }
+    /**
+        Sets editor for a property.

 
 

-    /** Sets property's label.
+        @param editor
+            For builtin editors, use wxPGEditor_X, where X is builtin editor's
+            name (TextCtrl, Choice, etc. see wxPGEditor documentation for full list).

 
 

-        @remarks
-        - Properties under same parent may have same labels. However,
-        property names must still remain unique.
+        For custom editors, use pointer you received from wxPropertyGrid::RegisterEditorClass().

     */
     */

-    void SetLabel( const wxString& label ) { m_label = label; }
+    void SetEditor( const wxPGEditor* editor );

 
 

-    inline void SetName( const wxString& newName );
+    /**
+        Sets editor for a property, by editor name.
+    */
+    void SetEditor( const wxString& editorName );

 
 

-    void SetValueToUnspecified()
-    {
-        wxVariant val;  // Create NULL variant
-        SetValue(val);
-    }
+    /**
+        Sets cell information for given column.
+    */
+    void SetCell( int column, const wxPGCell& cell );

 
 

-    /** Sets wxValidator for a property*/
-    void SetValidator( const wxValidator& validator )
-    {
-        m_validator = wxDynamicCast(validator.Clone(),wxValidator);
-    }
+    /**
+        Sets new set of choices for property.

 
 

-    /** Gets assignable version of property's validator. */
-    wxValidator* GetValidator() const
-    {
-        if ( m_validator )
-            return m_validator;
-        return DoGetValidator();
-    }
-
-    /** Updates property value in case there were last minute
-        changes. If value was unspecified, it will be set to default.
-        Use only for properties that have TextCtrl-based editor.
-        @remarks
-        If you have code similar to
-        @code
-            // Update the value in case of last minute changes
-            if ( primary && propgrid->IsEditorsValueModified() )
-                 GetEditorClass()->CopyValueFromControl( this, primary );
-        @endcode
-        in wxPGProperty::OnEvent wxEVT_COMMAND_BUTTON_CLICKED handler,
-        then replace it with call to this method.
-        @retval
-        True if value changed.
+        @remarks This operation clears the property value.

     */
     */

-    bool PrepareValueForDialogEditing( wxPropertyGrid* propgrid );
+    bool SetChoices( wxPGChoices& choices );

 
 

-    /** Returns client data (void*) of a property.
+    /**
+        If property has choices and they are not yet exclusive, new such copy
+        of them will be created.

     */
     */

-    void* GetClientData() const
-    {
-        return m_clientData;
-    }
+    void SetChoicesExclusive();

 
 

-    /** Sets client data (void*) of a property.
-        @remarks
-        This untyped client data has to be deleted manually.
+    /**
+        Sets client data (void*) of a property.
+
+        @remarks This untyped client data has to be deleted manually.

     */
     */

-    void SetClientData( void* clientData )
-    {
-        m_clientData = clientData;
-    }
+    void SetClientData( void* clientData );

 
     /** Returns client object of a property.
     */
 
     /** Returns client object of a property.
     */

-    void SetClientObject(wxClientData* clientObject)
-    {
-        delete m_clientObject;
-        m_clientObject = clientObject;
-    }
+    void SetClientObject(wxClientData* clientObject);

 
 

-    /** Sets managed client object of a property.
-    */
-    wxClientData *GetClientObject() const { return m_clientObject; }
+    /**
+        Sets selected choice and changes property value.

 
 

-    /** Sets new set of choices for property.
+        Tries to retain value type, although currently if it is not string,
+        then it is forced to integer.
+    */
+    void SetChoiceSelection( int newValue );

 
 

-        @remarks
-        This operation clears the property value.
+    /**
+        Sets property's help string, which is shown, for example, in
+        wxPropertyGridManager's description text box.

     */
     */

-    bool SetChoices( wxPGChoices& choices );
+    void SetHelpString( const wxString& helpString );
+
+    /**
+        Sets property's label.

 
 

-    /** Sets new set of choices for property.
+        @remarks Properties under same parent may have same labels. However,
+                property names must still remain unique.

     */
     */

-    inline bool SetChoices( const wxArrayString& labels,
-                            const wxArrayInt& values = wxArrayInt() );
+    void SetLabel( const wxString& label );

 
 

-    /** Set max length of text in text editor.
+    /**
+        Set max length of text in text editor.

     */
     */

-    inline bool SetMaxLength( int maxLen );
+    bool SetMaxLength( int maxLen );

 
 

-    /** Call with 'false' in OnSetValue to cancel value changes after all
-        (ie. cancel 'true' returned by StringToValue() or IntToValue()).
+    /**
+        Sets property's "is it modified?" flag. Affects children recursively.

     */
     */

-    void SetWasModified( bool set = true )
-    {
-        if ( set ) m_flags |= wxPG_PROP_WAS_MODIFIED;
-        else m_flags &= ~wxPG_PROP_WAS_MODIFIED;
-    }
+    void SetModifiedStatus( bool modified );

 
 

-    const wxString& GetHelpString() const
-    {
-        return m_helpString;
-    }
+    /**
+        Sets new (base) name for property.
+    */
+    void SetName( const wxString& newName );

 
 

-    void ClearFlag( FlagType flag ) { m_flags &= ~(flag); }
+    /**
+        Changes what sort of parent this property is for its children.

 
 

-    // Use, for example, to detect if item is inside collapsed section.
-    bool IsSomeParent( wxPGProperty* candidate_parent ) const;
+        @param flag
+            Use one of the following values: wxPG_PROP_MISC_PARENT (for generic
+            parents), wxPG_PROP_CATEGORY (for categories), or
+            wxPG_PROP_AGGREGATE (for derived property classes with private
+            children).

 
 

-    /** Adapts list variant into proper value using consequtive ChildChanged-calls.
+        @remarks You only need to call this if you use AddChild() to add
+                 child properties. Adding properties with
+                 wxPropertyGridInterface::Insert() or
+                 wxPropertyGridInterface::AppendIn() will automatically set
+                 property to use wxPG_PROP_MISC_PARENT style.

     */
     */

-    void AdaptListToValue( wxVariant& list, wxVariant* value ) const;
+    void SetParentalType( int flag );

 
 

-    /** This is used by properties that have fixed sub-properties. */
-    void AddChild( wxPGProperty* prop );
+    /**
+        Sets property's text colour.

 
 

-    /** Returns height of children, recursively, and
-        by taking expanded/collapsed status into account.
+        @param colour
+            Text colour to use.

 
 

-        iMax is used when finding property y-positions.
+        @param recursively
+            If @true, children are affected recursively, and any categories
+            are not.

     */
     */

-    int GetChildrenHeight( int lh, int iMax = -1 ) const;
+    void SetTextColour( const wxColour& colour,
+                        bool recursively = false );

 
 

-    /** Returns number of child properties */
-    unsigned int GetChildCount() const { return m_children.GetCount(); }
+    /** Sets wxValidator for a property */
+    void SetValidator( const wxValidator& validator );

 
 

-    /** Returns sub-property at index i. */
-    wxPGProperty* Item( size_t i ) const { return (wxPGProperty*)m_children.Item(i); }
+    /**
+        Call this to set value of the property. Unlike methods in wxPropertyGrid,
+        this does not automatically update the display.
+
+        @remarks
+            Use wxPropertyGrid::ChangePropertyValue() instead if you need to run through
+            validation process and send property change event.

 
 

-    /** Returns last sub-property.
+            If you need to change property value in event, based on user input, use
+            SetValueInEvent() instead.
+
+        @param value
+            The value to set.
+        @param pList
+            Pointer to list variant that contains child values. Used to indicate
+            which children should be marked as modified. Usually you just use @NULL.
+        @param flags
+            Use wxPG_SETVAL_REFRESH_EDITOR to update editor control, if it
+            was selected.

     */
     */

-    wxPGProperty* Last() const { return (wxPGProperty*)m_children.Last(); }
+    void SetValue( wxVariant value, wxVariant* pList = NULL, int flags = 0 );

 
 

-    /** Returns index of given sub-property. */
-    int Index( const wxPGProperty* p ) const { return m_children.Index((wxPGProperty*)p); }
+    /**
+        Set wxBitmap in front of the value. This bitmap may be ignored
+        by custom cell renderers.
+    */
+    void SetValueImage( wxBitmap& bmp );

 
 

-    /** Deletes all sub-properties. */
-    void Empty();
+    /**
+        Call this function in OnEvent(), OnButtonClick() etc. to change the
+        property value based on user input.

 
 

-    // Puts correct indexes to children
-    void FixIndexesOfChildren( size_t starthere = 0 );
+        @remarks This method is const since it doesn't actually modify value, but posts
+                given variant as pending value, stored in wxPropertyGrid.
+    */
+    void SetValueInEvent( wxVariant value ) const;

 
 

-    wxPGProperty* GetItemAtY( unsigned int y, unsigned int lh, unsigned int* nextItemY ) const;
+    /**
+        Sets property's value to unspecified (ie. Null variant).
+    */
+    void SetValueToUnspecified();

 
 

-    /** Returns (direct) child property with given name (or NULL if not found).
+    /**
+        Call with @false in OnSetValue() to cancel value changes after all
+        (ie. cancel @true returned by StringToValue() or IntToValue()).

     */
     */

-    wxPGProperty* GetPropertyByName( const wxString& name ) const;
+    void SetWasModified( bool set = true );
+
+    /**
+        Updates composed values of parent non-category properties, recursively.
+        Returns topmost property updated.
+    */
+    wxPGProperty* UpdateParentValues();
+
+    /**
+        Returns @true if containing grid uses wxPG_EX_AUTO_UNSPECIFIED_VALUES.
+    */
+    bool UsesAutoUnspecified() const;

 };
 
 
 };
 
 

-/** @class wxPGChoices
+/**
+    @class wxPGChoices

 
     Helper class for managing choices of wxPropertyGrid properties.
     Each entry can have label, value, bitmap, text colour, and background colour.
 
     Helper class for managing choices of wxPropertyGrid properties.
     Each entry can have label, value, bitmap, text colour, and background colour.


@@ -1313,51 +1419,28 @@ class WXDLLIMPEXP_PROPGRID wxPGChoices
 public:
     typedef long ValArrItem;
 
 public:
     typedef long ValArrItem;
 

-    /** Default constructor. */
-    wxPGChoices()
-    {
-        Init();
-    }
+    /**
+        Default constructor.
+    */
+    wxPGChoices();

 
     /** Copy constructor. */
 
     /** Copy constructor. */

-    wxPGChoices( const wxPGChoices& a )
-    {
-        if ( a.m_data != wxPGChoicesEmptyData )
-        {
-            m_data = a.m_data;
-            m_data->m_refCount++;
-        }
-    }
+    wxPGChoices( const wxPGChoices& a );

 
     /** Constructor. */
 
     /** Constructor. */

-    wxPGChoices( const wxChar** labels, const long* values = NULL )
-    {
-        Init();
-        Set(labels,values);
-    }
+    wxPGChoices( const wxChar** labels, const long* values = NULL );

 
     /** Constructor. */
 
     /** Constructor. */

-    wxPGChoices( const wxArrayString& labels, const wxArrayInt& values = wxArrayInt() )
-    {
-        Init();
-        Set(labels,values);
-    }
-
-    /** Simple interface constructor. */
-    wxPGChoices( wxPGChoicesData* data )
-    {
-        wxASSERT(data);
-        m_data = data;
-        data->m_refCount++;
-    }
+    wxPGChoices( const wxArrayString& labels, const wxArrayInt& values = wxArrayInt() );
+
+    /** Constructor. */
+    wxPGChoices( wxPGChoicesData* data );

 
     /** Destructor. */
 
     /** Destructor. */

-    ~wxPGChoices()
-    {
-        Free();
-    }
+    ~wxPGChoices();

 
 

-    /** Adds to current. If did not have own copies, creates them now. If was empty,
+    /**
+        Adds to current. If did not have own copies, creates them now. If was empty,

         identical to set except that creates copies.
     */
     void Add( const wxChar** labels, const ValArrItem* values = NULL );
         identical to set except that creates copies.
     */
     void Add( const wxChar** labels, const ValArrItem* values = NULL );


@@ -1372,177 +1455,128 @@ public:
     wxPGChoiceEntry& Add( const wxString& label, int value = wxPG_INVALID_VALUE );
 
     /** Adds a single item, with bitmap. */
     wxPGChoiceEntry& Add( const wxString& label, int value = wxPG_INVALID_VALUE );
 
     /** Adds a single item, with bitmap. */

-    wxPGChoiceEntry& Add( const wxString& label, const wxBitmap& bitmap, int value = wxPG_INVALID_VALUE );
+    wxPGChoiceEntry& Add( const wxString& label, const wxBitmap& bitmap,
+                          int value = wxPG_INVALID_VALUE );

 
     /** Adds a single item with full entry information. */
 
     /** Adds a single item with full entry information. */

-    wxPGChoiceEntry& Add( const wxPGChoiceEntry& entry )
-    {
-        return Insert(entry, -1);
-    }
+    wxPGChoiceEntry& Add( const wxPGChoiceEntry& entry );

 
 

-    /** Adds single item. */
+    /** Adds single item, sorted. */

     wxPGChoiceEntry& AddAsSorted( const wxString& label, int value = wxPG_INVALID_VALUE );
 
     wxPGChoiceEntry& AddAsSorted( const wxString& label, int value = wxPG_INVALID_VALUE );
 

-    void Assign( const wxPGChoices& a )
-    {
-        AssignData(a.m_data);
-    }
+    /**
+        Assigns data from another set of choices.
+    */
+    void Assign( const wxPGChoices& a );

 
 

+    /**
+        Assigns data from another set of choices.
+    */

     void AssignData( wxPGChoicesData* data );
 
     void AssignData( wxPGChoicesData* data );
 

-    /** Delete all choices. */
-    void Clear()
-    {
-        if ( m_data != wxPGChoicesEmptyData )
-            m_data->Clear();
-    }
-
-    void EnsureData()
-    {
-        if ( m_data == wxPGChoicesEmptyData )
-            m_data = new wxPGChoicesData();
-    }
-
-    /** Gets a unsigned number identifying this list. */
-    wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; };
-
-    const wxString& GetLabel( size_t ind ) const
-    {
-        wxASSERT( ind >= 0 && ind < GetCount() );
-        return Item(ind).GetText();
-    }
-
-    size_t GetCount () const
-    {
-        wxASSERT_MSG( m_data,
-            wxT("When checking if wxPGChoices is valid, use IsOk() instead of GetCount()") );
-        return m_data->GetCount();
-    }
-
-    int GetValue( size_t ind ) const { return Item(ind).GetValue(); }
-
-    /** Returns array of values matching the given strings. Unmatching strings
+    /**
+        Deletes all items.
+    */
+    void Clear();
+
+    /**
+        Returns labe of item.
+    */
+    const wxString& GetLabel( unsigned int ind ) const;
+
+    /**
+        Returns number of items.
+    */
+    unsigned int GetCount() const;
+
+    /**
+        Returns value of item;
+    */
+    int GetValue( unsigned int ind ) const;
+
+    /**
+        Returns array of values matching the given strings. Unmatching strings

         result in wxPG_INVALID_VALUE entry in array.
     */
     wxArrayInt GetValuesForStrings( const wxArrayString& strings ) const;
 
         result in wxPG_INVALID_VALUE entry in array.
     */
     wxArrayInt GetValuesForStrings( const wxArrayString& strings ) const;
 

-    /** Returns array of indices matching given strings. Unmatching strings
-        are added to 'unmatched', if not NULL.
+    /**
+        Returns array of indices matching given strings. Unmatching strings
+        are added to 'unmatched', if not @NULL.

     */
     */

-    wxArrayInt GetIndicesForStrings( const wxArrayString& strings, wxArrayString* unmatched = NULL ) const;
+    wxArrayInt GetIndicesForStrings( const wxArrayString& strings,
+                                     wxArrayString* unmatched = NULL ) const;

 
 

-    /** Returns true if choices in general are likely to have values
-        (depens on that all entries have values or none has)
+    /**
+        Returns @true if item at given index has a valid value;

     */
     */

-    bool HasValues() const;
+    bool HasValue( unsigned int i ) const;

 
 

-    bool HasValue( unsigned int i ) const { return (m_data->GetCount() > i && m_data->Item(i)->HasValue()); }
+    /**
+        Returns index of item with given label.
+    */
+    int Index( const wxString& label ) const;

 
 

-    int Index( const wxString& str ) const;
+    /**
+        Returns index of item with given value.
+    */

     int Index( int val ) const;
 
     int Index( int val ) const;
 

-    /** Inserts single item. */
+    /**
+        Inserts single item.
+    */

     wxPGChoiceEntry& Insert( const wxString& label, int index, int value = wxPG_INVALID_VALUE );
 
     wxPGChoiceEntry& Insert( const wxString& label, int index, int value = wxPG_INVALID_VALUE );
 

-    /** Inserts a single item with full entry information. */
+    /**
+        Inserts a single item with full entry information.
+    */

     wxPGChoiceEntry& Insert( const wxPGChoiceEntry& entry, int index );
 
     wxPGChoiceEntry& Insert( const wxPGChoiceEntry& entry, int index );
 

-    /** Returns false if this is a constant empty set of choices,
+    /**
+        Returns @false if this is a constant empty set of choices,

         which should not be modified.
     */
         which should not be modified.
     */

-    bool IsOk() const
-    {
-        return ( m_data != wxPGChoicesEmptyData );
-    }
+    bool IsOk() const;

 
 

-    const wxPGChoiceEntry& Item( unsigned int i ) const
-    {
-        wxASSERT( IsOk() );
-        return *m_data->Item(i);
-    }
+    /**
+        Returns item at given index.
+    */
+    const wxPGChoiceEntry& Item( unsigned int i ) const;

 
 

-    wxPGChoiceEntry& Item( unsigned int i )
-    {
-        wxASSERT( IsOk() );
-        return *m_data->Item(i);
-    }
+    /**
+        Returns item at given index.
+    */
+    wxPGChoiceEntry& Item( unsigned int i );

 
 

-    /** Removes count items starting at position nIndex. */
+    /**
+        Removes count items starting at position nIndex.
+    */

     void RemoveAt(size_t nIndex, size_t count = 1);
 
     void RemoveAt(size_t nIndex, size_t count = 1);
 

-    /** Does not create copies for itself. */
-    void Set( const wxChar** labels, const long* values = NULL )
-    {
-        Free();
-        Add(labels,values);
-    }
+    /**
+        Sets contents from lists of strings and values.
+    */
+    void Set( const wxChar** labels, const long* values = NULL );

 
 

-    /** Version that works with wxArrayString.
-        TODO: Deprecate this.
+    /**
+        Sets contents from lists of strings and values.

     */
     */

-    void Set( wxArrayString& arr, const long* values = (const long*) NULL )
-    {
-        Free();
-        Add(arr,values);
-    }
+    void Set( const wxArrayString& labels, const wxArrayInt& values = wxArrayInt() );

 
 

-    /** Version that works with wxArrayString and wxArrayInt. */
-    void Set( const wxArrayString& labels, const wxArrayInt& values = wxArrayInt() )
-    {
-        Free();
-        if ( &values )
-            Add(labels,values);
-        else
-            Add(labels);
-    }
-
-    // Creates exclusive copy of current choices
-    void SetExclusive()
-    {
-        if ( m_data->m_refCount != 1 )
-        {
-            wxPGChoicesData* data = new wxPGChoicesData();
-            data->CopyDataFrom(m_data);
-            Free();
-            m_data = data;
-        }
-    }
-
-    // Returns data, increases refcount.
-    wxPGChoicesData* GetData()
-    {
-        wxASSERT( m_data->m_refCount != 0xFFFFFFF );
-        m_data->m_refCount++;
-        return m_data;
-    }
-
-    // Returns plain data ptr - no refcounting stuff is done.
-    wxPGChoicesData* GetDataPtr() const { return m_data; }
-
-    // Changes ownership of data to you.
-    wxPGChoicesData* ExtractData()
-    {
-        wxPGChoicesData* data = m_data;
-        m_data = wxPGChoicesEmptyData;
-        return data;
-    }
+    /**
+        Creates exclusive copy of current choices.
+    */
+    void SetExclusive();

 
 

+    /**
+        Returns array of choice labels.
+    */

     wxArrayString GetLabels() const;
 
     wxArrayString GetLabels() const;
 

-    void operator= (const wxPGChoices& a)
-    {
-        AssignData(a.m_data);
-    }
-
-    wxPGChoiceEntry& operator[](unsigned int i)
-    {
-        return Item(i);
-    }
+    void operator= (const wxPGChoices& a);

 
 

-    const wxPGChoiceEntry& operator[](unsigned int i) const
-    {
-        return Item(i);
-    }
+    wxPGChoiceEntry& operator[](unsigned int i);
+    const wxPGChoiceEntry& operator[](unsigned int i) const;

 };
 
 // -----------------------------------------------------------------------
 };
 
 // -----------------------------------------------------------------------