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

Correct the initial value setting in wxMSW wxSpinCtrl.

Browse Source 
Always use value argument for the text control contents and also override the
initial numeric value with it if it's numeric.

This seems to be the only consistent thing to do, so document this behaviour
and add a unit test checking for it.

Closes #13589.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-09 14:24:20 +00:00
parent 8087e6c942
commit 6e36db5eca
3 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/controls/spinctrltest.cpp
View File

@@ -33,12 +33,14 @@ public:
private:
CPPUNIT_TEST_SUITE( SpinCtrlTestCase );
CPPUNIT_TEST( Initial );
WXUISIM_TEST( Arrows );
WXUISIM_TEST( Wrap );
CPPUNIT_TEST( Range );
CPPUNIT_TEST( Value );
CPPUNIT_TEST_SUITE_END();
void Initial();
void Arrows();
void Wrap();
void Range();
@@ -65,6 +67,28 @@ void SpinCtrlTestCase::tearDown()
wxDELETE(m_spin);
}
void SpinCtrlTestCase::Initial()
{
// Initial value is defined by "initial" argument which is 0 by default.
CPPUNIT_ASSERT_EQUAL( 0, m_spin->GetValue() );
wxWindow* const parent = m_spin->GetParent();
// Recreate the control with another "initial" to check this.
delete m_spin;
m_spin = new wxSpinCtrl(parent, wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, 0,
0, 100, 17);
CPPUNIT_ASSERT_EQUAL( 17, m_spin->GetValue() );
// But if the text string is specified, it takes precedence.
delete m_spin;
m_spin = new wxSpinCtrl(parent, wxID_ANY, "99",
wxDefaultPosition, wxDefaultSize, 0,
0, 100, 17);
CPPUNIT_ASSERT_EQUAL( 99, m_spin->GetValue() );
}
void SpinCtrlTestCase::Arrows()
{
#if wxUSE_UIACTIONSIMULATOR