Add wxXmlResource::LoadObjectRecursively().

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

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 9bf9531fb83f70c62327751a5b0c7faba7878008..fb4c7bb7b843138f17a9e2df1f093dea7b20c49e 100644 (file)
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -428,11 +428,15 @@
         class MyProperty : public wxPGProperty
         {
         public:
         class MyProperty : public wxPGProperty
         {
         public:

-            // All arguments of ctor must have a default value -
+            // Default constructor
+            MyProperty() { }
+
+            // All arguments of this ctor must have a default value -

             // use wxPG_LABEL for label and name
             MyProperty( const wxString& label = wxPG_LABEL,
                         const wxString& name = wxPG_LABEL,
                         const wxString& value = wxEmptyString )
             // use wxPG_LABEL for label and name
             MyProperty( const wxString& label = wxPG_LABEL,
                         const wxString& name = wxPG_LABEL,
                         const wxString& value = wxEmptyString )

+                : wxPGProperty(label, name)

             {
                 // m_value is wxVariant
                 m_value = value;
             {
                 // m_value is wxVariant
                 m_value = value;


@@ -509,7 +513,7 @@ public:
         @code
 
         MyProperty( const wxString& label, const wxString& name, const T& value )
         @code
 
         MyProperty( const wxString& label, const wxString& name, const T& value )

-            : wxPGProperty()
+            : wxPGProperty(label, name)

         {
             // Generally recommended way to set the initial value
             // (as it should work in pretty much 100% of cases).
         {
             // Generally recommended way to set the initial value
             // (as it should work in pretty much 100% of cases).


@@ -698,18 +702,25 @@ public:
     virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* wnd_primary, wxEvent& event );
 
     /**
     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
-        usually called at the time that value of this property, or given child property, is
-        still pending for change.
+        Called after value of a child property has been altered. Must return
+        new value of the whole property (after any alterations warrented by
+        child's new value).
+
+        Note that this function is usually called at the time that value of
+        this property, or given child property, is still pending for change,
+        and as such, result of GetValue() or m_value should not be relied
+        on.

 
         Sample pseudo-code implementation:
 
         @code
 
         Sample pseudo-code implementation:
 
         @code

-        void MyProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+        wxVariant MyProperty::ChildChanged( wxVariant& thisValue,
+                                            int childIndex,
+                                            wxVariant& childValue ) const

         {
             // Acquire reference to actual type of data stored in variant
         {
             // Acquire reference to actual type of data stored in variant

-            // (TFromVariant only exists if wxPropertyGrid's wxVariant-macros were used to create
-            // the variant class).
+            // (TFromVariant only exists if wxPropertyGrid's wxVariant-macros
+            // were used to create the variant class).

             T& data = TFromVariant(thisValue);
 
             // Copy childValue into data.
             T& data = TFromVariant(thisValue);
 
             // Copy childValue into data.


@@ -723,17 +734,28 @@ public:
                     break;
                 ...
             }
                     break;
                 ...
             }

+
+            // Return altered data
+            return data;

         }
         @endcode
 
         @param thisValue
         }
         @endcode
 
         @param thisValue

-            Value of this property, that should be altered.
+            Value of this property. Changed value should be returned (in
+            previous versions of wxPropertyGrid it was only necessary to
+            write value back to this argument).

         @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
+            child property).

         @param childValue
         @param childValue

-            Value of the child property.
+            (Pending) value of the child property.
+
+        @return
+            Modified value of the whole property.

     */
     */

-    virtual void ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const;
+    virtual wxVariant ChildChanged( wxVariant& thisValue,
+                                    int childIndex,
+                                    wxVariant& childValue ) const;

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


@@ -1006,9 +1028,23 @@ public:
 
     /**
         Returns wxPGCell of given column.
 
     /**
         Returns wxPGCell of given column.

+
+        @remarks const version of this member function returns 'default'
+                 wxPGCell object if the property itself didn't hold
+                 cell data.

     */
     const wxPGCell& GetCell( unsigned int column ) const;
 
     */
     const wxPGCell& GetCell( unsigned int column ) const;
 

+    /**
+        Returns wxPGCell of given column, creating one if necessary.
+    */
+    wxPGCell& GetCell( unsigned int column );
+
+    /**
+        Returns wxPGCell of given column, creating one if necessary.
+    */
+    wxPGCell& GetOrCreateCell( unsigned int column );
+

     /**
         Returns number of child properties.
     */
     /**
         Returns number of child properties.
     */