wxMessageBox off the main thread lost result code.

[wxWidgets.git] / tests / controls / spinctrltest.cpp

diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp
index a1e29cf3bdfe528483d5da9756058b6e6d129123..1ef3068a14ec90c3a4ca52629c951ea61a56b018 100644 (file)
--- a/tests/controls/spinctrltest.cpp
+++ b/tests/controls/spinctrltest.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxSpinCtrl unit test
 // Author:      Steven Lamerton
 // Created:     2010-07-21
-// RCS-ID:      $Id$
 // Copyright:   (c) 2010 Steven Lamerton
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -83,6 +82,14 @@ void SpinCtrlTestCase::Initial()
                             0, 100, 17);
     CPPUNIT_ASSERT_EQUAL( 17, m_spin->GetValue() );
 
+    // Recreate the control with another "initial" outside of standard spin
+    // ctrl range.
+    delete m_spin;
+    m_spin = new wxSpinCtrl(parent, wxID_ANY, "",
+                            wxDefaultPosition, wxDefaultSize, 0,
+                            0, 200, 150);
+    CPPUNIT_ASSERT_EQUAL( 150, m_spin->GetValue() );
+
     // But if the text string is specified, it takes precedence.
     delete m_spin;
     m_spin = new wxSpinCtrl(parent, wxID_ANY, "99",
@@ -99,19 +106,21 @@ void SpinCtrlTestCase::NoEventsInCtor()
     delete m_spin;
     m_spin = new wxSpinCtrl;
 
-    EventCounter updated(m_spin, wxEVT_COMMAND_SPINCTRL_UPDATED);
+    EventCounter updatedSpin(m_spin, wxEVT_SPINCTRL);
+    EventCounter updatedText(m_spin, wxEVT_TEXT);
 
     m_spin->Create(parent, wxID_ANY, "",
                    wxDefaultPosition, wxDefaultSize, 0,
                    0, 100, 17);
 
-    CPPUNIT_ASSERT_EQUAL(0, updated.GetCount());
+    CPPUNIT_ASSERT_EQUAL(0, updatedSpin.GetCount());
+    CPPUNIT_ASSERT_EQUAL(0, updatedText.GetCount());
 }
 
 void SpinCtrlTestCase::Arrows()
 {
 #if wxUSE_UIACTIONSIMULATOR
-    EventCounter updated(m_spin, wxEVT_COMMAND_SPINCTRL_UPDATED);
+    EventCounter updated(m_spin, wxEVT_SPINCTRL);
 
     wxUIActionSimulator sim;
 
@@ -169,11 +178,14 @@ void SpinCtrlTestCase::Range()
     // that this doesn't result in any events (as this is not something done by
     // the user).
     {
-        EventCounter updated(m_spin, wxEVT_COMMAND_SPINCTRL_UPDATED);
+        EventCounter updatedSpin(m_spin, wxEVT_SPINCTRL);
+        EventCounter updatedText(m_spin, wxEVT_TEXT);
 
         m_spin->SetRange(1, 10);
         CPPUNIT_ASSERT_EQUAL(1, m_spin->GetValue());
-        CPPUNIT_ASSERT_EQUAL(0, updated.GetCount());
+
+        CPPUNIT_ASSERT_EQUAL(0, updatedSpin.GetCount());
+        CPPUNIT_ASSERT_EQUAL(0, updatedText.GetCount());
     }
 
     //Test negative ranges
@@ -191,19 +203,23 @@ void SpinCtrlTestCase::Range()
 
 void SpinCtrlTestCase::Value()
 {
+    EventCounter updatedSpin(m_spin, wxEVT_SPINCTRL);
+    EventCounter updatedText(m_spin, wxEVT_TEXT);
+
     CPPUNIT_ASSERT_EQUAL(0, m_spin->GetValue());
 
     m_spin->SetValue(50);
-
     CPPUNIT_ASSERT_EQUAL(50, m_spin->GetValue());
 
     m_spin->SetValue(-10);
-
     CPPUNIT_ASSERT_EQUAL(0, m_spin->GetValue());
 
     m_spin->SetValue(110);
-
     CPPUNIT_ASSERT_EQUAL(100, m_spin->GetValue());
+
+    // Calling SetValue() shouldn't have generated any events.
+    CPPUNIT_ASSERT_EQUAL(0, updatedSpin.GetCount());
+    CPPUNIT_ASSERT_EQUAL(0, updatedText.GetCount());
 }
 
 #endif