Replace wxComboBox::IsEmpty() with Is{List,Text}Empty().
IsEmpty() didn't exist in all ports (notably not wxMSW) and its meaning was unclear anyhow, so remove it even from the ports where it did exist and add clear Is{List,Text}Empty() replacements instead. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -62,12 +62,14 @@ private:
|
||||
CPPUNIT_TEST( PopDismiss );
|
||||
CPPUNIT_TEST( Sort );
|
||||
CPPUNIT_TEST( ReadOnly );
|
||||
CPPUNIT_TEST( IsEmpty );
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
void Size();
|
||||
void PopDismiss();
|
||||
void Sort();
|
||||
void ReadOnly();
|
||||
void IsEmpty();
|
||||
|
||||
wxComboBox *m_combo;
|
||||
|
||||
@@ -194,4 +196,27 @@ void ComboBoxTestCase::ReadOnly()
|
||||
#endif
|
||||
}
|
||||
|
||||
void ComboBoxTestCase::IsEmpty()
|
||||
{
|
||||
CPPUNIT_ASSERT( m_combo->IsListEmpty() );
|
||||
CPPUNIT_ASSERT( m_combo->IsTextEmpty() );
|
||||
|
||||
m_combo->Append("foo");
|
||||
CPPUNIT_ASSERT( !m_combo->IsListEmpty() );
|
||||
CPPUNIT_ASSERT( m_combo->IsTextEmpty() );
|
||||
|
||||
m_combo->SetValue("bar");
|
||||
CPPUNIT_ASSERT( !m_combo->IsListEmpty() );
|
||||
CPPUNIT_ASSERT( !m_combo->IsTextEmpty() );
|
||||
|
||||
m_combo->Clear();
|
||||
CPPUNIT_ASSERT( m_combo->IsListEmpty() );
|
||||
CPPUNIT_ASSERT( m_combo->IsTextEmpty() );
|
||||
|
||||
#ifdef TEST_INVALID_COMBOBOX_ISEMPTY
|
||||
// Compiling this should fail, see failtest target definition in test.bkl.
|
||||
m_combo->IsEmpty();
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif //wxUSE_COMBOBOX
|
||||
|
Reference in New Issue
Block a user