fixes potential crash under gatekeeper

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

diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp
index 12b68102d2cf85cd82b03bbe70bc66565f6498d4..88e86d35167de29ebad8db68f0c9bcd707b5c460 100644 (file)
--- a/tests/controls/spinctrltest.cpp
+++ b/tests/controls/spinctrltest.cpp
@@ -83,6 +83,14 @@ void SpinCtrlTestCase::Initial()
                             0, 100, 17);
     CPPUNIT_ASSERT_EQUAL( 17, m_spin->GetValue() );
 
                             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",
     // But if the text string is specified, it takes precedence.
     delete m_spin;
     m_spin = new wxSpinCtrl(parent, wxID_ANY, "99",


@@ -99,7 +107,7 @@ void SpinCtrlTestCase::NoEventsInCtor()
     delete m_spin;
     m_spin = new wxSpinCtrl;
 
     delete m_spin;
     m_spin = new wxSpinCtrl;
 

-    EventCounter updated(m_spin, wxEVT_COMMAND_SPINCTRL_UPDATED);
+    EventCounter updated(m_spin, wxEVT_SPINCTRL);

 
     m_spin->Create(parent, wxID_ANY, "",
                    wxDefaultPosition, wxDefaultSize, 0,
 
     m_spin->Create(parent, wxID_ANY, "",
                    wxDefaultPosition, wxDefaultSize, 0,


@@ -111,7 +119,7 @@ void SpinCtrlTestCase::NoEventsInCtor()
 void SpinCtrlTestCase::Arrows()
 {
 #if wxUSE_UIACTIONSIMULATOR
 void SpinCtrlTestCase::Arrows()
 {
 #if wxUSE_UIACTIONSIMULATOR

-    EventCounter updated(m_spin, wxEVT_COMMAND_SPINCTRL_UPDATED);
+    EventCounter updated(m_spin, wxEVT_SPINCTRL);

 
     wxUIActionSimulator sim;
 
 
     wxUIActionSimulator sim;
 


@@ -165,7 +173,18 @@ void SpinCtrlTestCase::Range()
     CPPUNIT_ASSERT_EQUAL(0, m_spin->GetMin());
     CPPUNIT_ASSERT_EQUAL(100, m_spin->GetMax());
 
     CPPUNIT_ASSERT_EQUAL(0, m_spin->GetMin());
     CPPUNIT_ASSERT_EQUAL(100, m_spin->GetMax());
 

-    //Test neagtive ranges
+    // Test that the value is adjusted to be inside the new valid range but
+    // that this doesn't result in any events (as this is not something done by
+    // the user).
+    {
+        EventCounter updated(m_spin, wxEVT_SPINCTRL);
+
+        m_spin->SetRange(1, 10);
+        CPPUNIT_ASSERT_EQUAL(1, m_spin->GetValue());
+        CPPUNIT_ASSERT_EQUAL(0, updated.GetCount());
+    }
+
+    //Test negative ranges

     m_spin->SetRange(-10, 10);
 
     CPPUNIT_ASSERT_EQUAL(-10, m_spin->GetMin());
     m_spin->SetRange(-10, 10);
 
     CPPUNIT_ASSERT_EQUAL(-10, m_spin->GetMin());