Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxString::empty() function calls to determine if string is empty in wxPG.

Browse Source 
Use this dedicated function instead of explicitly check if wxString::length() returns non-zero value.
This commit is contained in:
Artur Wieczorek
2015-05-15 22:27:54 +02:00
parent fc68bb4252
commit 4b8e8adf16
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/propgrid/manager.cpp
View File

@@ -982,7 +982,7 @@ wxPropertyGridPage* wxPropertyGridManager::InsertPage( int index,
if ( !label.empty() ) 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")); wxT("If page label is given in constructor, empty label must be given in AddPage"));
pageObj->m_label = label; pageObj->m_label = label;
} }

2
src/propgrid/property.cpp
View File

@@ -2299,7 +2299,7 @@ void wxPGProperty::DoAddChild( wxPGProperty* prop, int index,
void wxPGProperty::DoPreAddChild( int index, wxPGProperty* prop ) 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 " "Property's children must have unique, non-empty "
"names within their scope" ); "names within their scope" );

2
src/propgrid/propgridpagestate.cpp
View File

@@ -1692,7 +1692,7 @@ bool wxPropertyGridPageState::PrepareToAddItem( wxPGProperty* property,
if ( scheduledParent && !scheduledParent->IsCategory() ) 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" ); "Property's children must have unique, non-empty names within their scope" );
} }

2
src/propgrid/props.cpp
View File

@@ -95,7 +95,7 @@ wxString wxStringProperty::ValueToString( wxVariant& value,
// Value stored in m_value is non-editable, non-full value // Value stored in m_value is non-editable, non-full value
if ( (argFlags & wxPG_FULL_VALUE) || if ( (argFlags & wxPG_FULL_VALUE) ||
(argFlags & wxPG_EDITABLE_VALUE) || (argFlags & wxPG_EDITABLE_VALUE) ||
!s.length() ) s.empty() )
{ {
// Calling this under incorrect conditions will fail // Calling this under incorrect conditions will fail
wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT, wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT,