projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce the number of wxAny tests ran under wxOSX further.
[wxWidgets.git]
/
tests
/
controls
/
bitmaptogglebuttontest.cpp
diff --git
a/tests/controls/bitmaptogglebuttontest.cpp
b/tests/controls/bitmaptogglebuttontest.cpp
index a71be54b064e84a000a7630a5926eeb3a5343513..03a7e7eac03869009e2129dbae743f3621b00707 100644
(file)
--- a/
tests/controls/bitmaptogglebuttontest.cpp
+++ b/
tests/controls/bitmaptogglebuttontest.cpp
@@
-9,10
+9,16
@@
#include "testprec.h"
#include "testprec.h"
+#if wxUSE_TOGGLEBTN
+
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#include "wx/tglbtn.h"
+
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#endif // WX_PRECOMP
#ifndef WX_PRECOMP
#include "wx/app.h"
#endif // WX_PRECOMP
@@
-20,7
+26,6
@@
#include "testableframe.h"
#include "wx/uiaction.h"
#include "wx/artprov.h"
#include "testableframe.h"
#include "wx/uiaction.h"
#include "wx/artprov.h"
-#include "wx/tglbtn.h"
class BitmapToggleButtonTestCase : public CppUnit::TestCase
{
class BitmapToggleButtonTestCase : public CppUnit::TestCase
{
@@
-47,7
+52,7
@@
private:
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( BitmapToggleButtonTestCase );
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( BitmapToggleButtonTestCase );
-// also include in it
'
s own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BitmapToggleButtonTestCase,
"BitmapToggleButtonTestCase" );
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BitmapToggleButtonTestCase,
"BitmapToggleButtonTestCase" );
@@
-69,10
+74,7
@@
void BitmapToggleButtonTestCase::tearDown()
void BitmapToggleButtonTestCase::Click()
{
#if wxUSE_UIACTIONSIMULATOR
void BitmapToggleButtonTestCase::Click()
{
#if wxUSE_UIACTIONSIMULATOR
- wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
- wxTestableFrame);
-
- EventCounter count(m_button, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED);
+ EventCounter clicked(m_button, wxEVT_TOGGLEBUTTON);
wxUIActionSimulator sim;
wxUIActionSimulator sim;
@@
-83,25
+85,23
@@
void BitmapToggleButtonTestCase::Click()
sim.MouseClick();
wxYield();
sim.MouseClick();
wxYield();
- CPPUNIT_ASSERT_EQUAL(1,
frame->GetEven
tCount());
+ CPPUNIT_ASSERT_EQUAL(1,
clicked.Ge
tCount());
CPPUNIT_ASSERT(m_button->GetValue());
CPPUNIT_ASSERT(m_button->GetValue());
+ clicked.Clear();
wxMilliSleep(1000);
sim.MouseClick();
wxYield();
wxMilliSleep(1000);
sim.MouseClick();
wxYield();
- CPPUNIT_ASSERT_EQUAL(1,
frame->GetEven
tCount());
+ CPPUNIT_ASSERT_EQUAL(1,
clicked.Ge
tCount());
CPPUNIT_ASSERT(!m_button->GetValue());
#endif // wxUSE_UIACTIONSIMULATOR
}
void BitmapToggleButtonTestCase::Value()
{
CPPUNIT_ASSERT(!m_button->GetValue());
#endif // wxUSE_UIACTIONSIMULATOR
}
void BitmapToggleButtonTestCase::Value()
{
- wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
- wxTestableFrame);
-
- EventCounter count(m_button, wxEVT_COMMAND_BUTTON_CLICKED);
+ EventCounter clicked(m_button, wxEVT_BUTTON);
m_button->SetValue(true);
m_button->SetValue(true);
@@
-111,5
+111,9
@@
void BitmapToggleButtonTestCase::Value()
CPPUNIT_ASSERT(!m_button->GetValue());
CPPUNIT_ASSERT(!m_button->GetValue());
- CPPUNIT_ASSERT_EQUAL( 0,
frame->GetEven
tCount() );
+ CPPUNIT_ASSERT_EQUAL( 0,
clicked.Ge
tCount() );
}
}
+
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
+#endif // wxUSE_TOGGLEBTN