Fixed compilation error on OS/2 (strnlen declaration was not visible).

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

diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index 64a2475d2d2d560e139654456c36950fe072c835..9f3764a71e2c123dbb9656a1dfffa901cfaab552 100644 (file)
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -234,7 +234,8 @@ private:
     } \
     const CLASS& operator=( const CLASS& it ) \
     { \
     } \
     const CLASS& operator=( const CLASS& it ) \
     { \

-        Assign(it); \
+        if (this != &it) \
+            Assign(it); \

         return *this; \
     } \
     CLASS& operator++() { Next(); return *this; } \
         return *this; \
     } \
     CLASS& operator++() { Next(); return *this; } \


@@ -359,9 +360,12 @@ public:
 #ifndef SWIG
     const wxPGVIterator& operator=( const wxPGVIterator& it )
     {
 #ifndef SWIG
     const wxPGVIterator& operator=( const wxPGVIterator& it )
     {

-        UnRef();
-        m_pIt = it.m_pIt;
-        m_pIt->IncRef();
+        if (this != &it)
+        {
+            UnRef();
+            m_pIt = it.m_pIt;
+            m_pIt->IncRef();
+        }

         return *this;
     }
 #endif
         return *this;
     }
 #endif


@@ -417,7 +421,7 @@ public:
         Override this member function to add custom behavior on property
         deletion.
     */
         Override this member function to add custom behavior on property
         deletion.
     */

-    virtual void DoDelete( wxPGProperty* item );
+    virtual void DoDelete( wxPGProperty* item, bool doDelete = true );

 
     wxSize DoFitColumns( bool allowGridResize = false );
 
 
     wxSize DoFitColumns( bool allowGridResize = false );
 


@@ -565,9 +569,6 @@ public:
 
     bool IsInNonCatMode() const { return (bool)(m_properties == m_abcArray); }
 
 
     bool IsInNonCatMode() const { return (bool)(m_properties == m_abcArray); }
 

-    /** Only inits arrays, doesn't migrate things or such. */
-    void InitNonCatMode ();
-

     void DoLimitPropertyEditing( wxPGProperty* p, bool limit = true )
     {
         p->SetFlagRecursively(wxPG_PROP_NOEDITOR, limit);
     void DoLimitPropertyEditing( wxPGProperty* p, bool limit = true )
     {
         p->SetFlagRecursively(wxPG_PROP_NOEDITOR, limit);


@@ -602,15 +603,15 @@ public:
     void DoSetPropertyValues( const wxVariantList& list,
                               wxPGProperty* default_category );
 
     void DoSetPropertyValues( const wxVariantList& list,
                               wxPGProperty* default_category );
 

-    void DoSetPropertyValueUnspecified( wxPGProperty* p );
-

     void SetSplitterLeft( bool subProps = false );
 
     /** Set virtual width for this particular page. */
     void SetVirtualWidth( int width );
 
     void SetSplitterLeft( bool subProps = false );
 
     /** Set virtual width for this particular page. */
     void SetVirtualWidth( int width );
 

-    void SortChildren( wxPGProperty* p );
-    void Sort();
+    void DoSortChildren( wxPGProperty* p, int flags = 0 );
+    void DoSort( int flags = 0 );
+
+    bool PrepareAfterItemsAdded();

 
     void SetSelection( wxPGProperty* p ) { m_selected = p; }
 
 
     void SetSelection( wxPGProperty* p ) { m_selected = p; }
 


@@ -703,6 +704,10 @@ protected:
     unsigned char               m_anyModified;
 
     unsigned char               m_vhCalcPending;
     unsigned char               m_anyModified;
 
     unsigned char               m_vhCalcPending;

+
+private:
+    /** Only inits arrays, doesn't migrate things or such. */
+    void InitNonCatMode();

 };
 
 #endif // #ifndef SWIG
 };
 
 #endif // #ifndef SWIG