projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding constants for newer OSX versions to make sure our conditional expressions...
[wxWidgets.git]
/
tests
/
controls
/
itemcontainertest.cpp
diff --git
a/tests/controls/itemcontainertest.cpp
b/tests/controls/itemcontainertest.cpp
index ab54a497021593b62f7ad751b68a60bb2a3495d4..48944ad0a87c55ce1c9d50e9a874ff0e5f85c29b 100644
(file)
--- a/
tests/controls/itemcontainertest.cpp
+++ b/
tests/controls/itemcontainertest.cpp
@@
-244,13
+244,16
@@
void ItemContainerTestCase::SetString()
container->Append(testitems);
container->Append(testitems);
+ container->SetSelection(0);
container->SetString(0, "new item 0");
container->SetString(0, "new item 0");
-#ifndef __WXOSX__
- container->SetString(2, "");
-#endif
-
CPPUNIT_ASSERT_EQUAL("new item 0", container->GetString(0));
CPPUNIT_ASSERT_EQUAL("new item 0", container->GetString(0));
+
+ // Modifying the item shouldn't deselect it.
+ CPPUNIT_ASSERT_EQUAL(0, container->GetSelection());
+
+ // wxOSX doesn't support having empty items in some containers.
#ifndef __WXOSX__
#ifndef __WXOSX__
+ container->SetString(2, "");
CPPUNIT_ASSERT_EQUAL("", container->GetString(2));
#endif
}
CPPUNIT_ASSERT_EQUAL("", container->GetString(2));
#endif
}