wxSocket::Initialize() and Shutdown() are for main thread only.

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

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 190947778a663b414d3e4756a804cf75b48cb733..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).


@@ -1024,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.
     */