use wxSwap()

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

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 4fa1488b0ee4989cd5fcd31ba02b3d59b39ae8b0..383ed10ec39bacea46d2e410b4ffdd566f1b8ac9 100644 (file)
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -1872,7 +1872,7 @@ protected:
     */
     wxString GetColumnText( unsigned int col ) const;
 
-    /** Returns (direct) child property with given label (or NULL if not found),
+    /** Returns (direct) child property with given name (or NULL if not found),
         with hint index.
 
         @param hintIndex
@@ -1881,8 +1881,8 @@ protected:
         @remarks
         Does not support scope (ie. Parent.Child notation).
     */
-    wxPGProperty* GetPropertyByLabelWH( const wxString& label,
-                                        unsigned int hintIndex ) const;
+    wxPGProperty* GetPropertyByNameWH( const wxString& name,
+                                       unsigned int hintIndex ) const;
 
     /** This is used by Insert etc. */
     void AddChild2( wxPGProperty* prop,
@@ -2142,13 +2142,12 @@ public:
     // Delete all entries
     void Clear();
 
-    size_t GetCount() const
-    {
-        return m_items.size();
-    }
+    size_t GetCount() const { return m_items.size(); }
 
     wxPGChoiceEntry* Item( unsigned int i ) const
     {
+        wxCHECK_MSG( i < GetCount(), NULL, "invalid index" );
+
         return (wxPGChoiceEntry*) m_items[i];
     }
 
@@ -2291,7 +2290,6 @@ public:
 
     const wxString& GetLabel( size_t ind ) const
     {
-        wxASSERT( ind >= 0 && ind < GetCount() );
         return Item(ind).GetText();
     }
 
@@ -2321,7 +2319,7 @@ public:
     bool HasValues() const;
 
     bool HasValue( unsigned int i ) const
-        { return (m_data->GetCount() > i && m_data->Item(i)->HasValue()); }
+        { return (i < m_data->GetCount()) && m_data->Item(i)->HasValue(); }
 
     int Index( const wxString& str ) const;
     int Index( int val ) const;