diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 3e32a4bf30..1fc51f4717 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -982,7 +982,7 @@ wxPropertyGridPage* wxPropertyGridManager::InsertPage( int index,
 
     if ( !label.empty() )
     {
-        wxASSERT_MSG( !pageObj->m_label.length(),
+        wxASSERT_MSG( pageObj->m_label.empty(),
                       wxT("If page label is given in constructor, empty label must be given in AddPage"));
         pageObj->m_label = label;
     }
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index af9225640e..b31f6a24f5 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -2299,7 +2299,7 @@ void wxPGProperty::DoAddChild( wxPGProperty* prop, int index,
 
 void wxPGProperty::DoPreAddChild( int index, wxPGProperty* prop )
 {
-    wxASSERT_MSG( prop->GetBaseName().length(),
+    wxASSERT_MSG( !prop->GetBaseName().empty(),
                   "Property's children must have unique, non-empty "
                   "names within their scope" );
 
diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index 277a071a0a..88fac75877 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -1692,7 +1692,7 @@ bool wxPropertyGridPageState::PrepareToAddItem( wxPGProperty* property,
 
     if ( scheduledParent && !scheduledParent->IsCategory() )
     {
-        wxASSERT_MSG( property->GetBaseName().length(),
+        wxASSERT_MSG( !property->GetBaseName().empty(),
                       "Property's children must have unique, non-empty names within their scope" );
     }
 
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 42da4513a4..166bce90c1 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -95,7 +95,7 @@ wxString wxStringProperty::ValueToString( wxVariant& value,
         // Value stored in m_value is non-editable, non-full value
         if ( (argFlags & wxPG_FULL_VALUE) ||
              (argFlags & wxPG_EDITABLE_VALUE) ||
-             !s.length() )
+             s.empty() )
         {
             // Calling this under incorrect conditions will fail
             wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT,