Get rid of redundant call to wxDELETE (no real change)
This commit is contained in:
@@ -53,6 +53,7 @@ private:
|
|||||||
// any meaning otherwise.
|
// any meaning otherwise.
|
||||||
bool CreateCheckBox(long style)
|
bool CreateCheckBox(long style)
|
||||||
{
|
{
|
||||||
|
wxDELETE( m_check );
|
||||||
m_check = new wxCheckBox(wxTheApp->GetTopWindow(), wxID_ANY, "Check box",
|
m_check = new wxCheckBox(wxTheApp->GetTopWindow(), wxID_ANY, "Check box",
|
||||||
wxDefaultPosition, wxDefaultSize, style);
|
wxDefaultPosition, wxDefaultSize, style);
|
||||||
return false;
|
return false;
|
||||||
@@ -110,7 +111,6 @@ void CheckBoxTestCase::Check()
|
|||||||
#ifdef wxHAS_3STATE_CHECKBOX
|
#ifdef wxHAS_3STATE_CHECKBOX
|
||||||
void CheckBoxTestCase::ThirdState()
|
void CheckBoxTestCase::ThirdState()
|
||||||
{
|
{
|
||||||
wxDELETE(m_check);
|
|
||||||
CreateCheckBox(wxCHK_3STATE);
|
CreateCheckBox(wxCHK_3STATE);
|
||||||
|
|
||||||
CPPUNIT_ASSERT_EQUAL(wxCHK_UNCHECKED, m_check->Get3StateValue());
|
CPPUNIT_ASSERT_EQUAL(wxCHK_UNCHECKED, m_check->Get3StateValue());
|
||||||
@@ -128,7 +128,6 @@ void CheckBoxTestCase::ThirdState()
|
|||||||
|
|
||||||
void CheckBoxTestCase::ThirdStateUser()
|
void CheckBoxTestCase::ThirdStateUser()
|
||||||
{
|
{
|
||||||
wxDELETE(m_check);
|
|
||||||
CreateCheckBox(wxCHK_3STATE | wxCHK_ALLOW_3RD_STATE_FOR_USER);
|
CreateCheckBox(wxCHK_3STATE | wxCHK_ALLOW_3RD_STATE_FOR_USER);
|
||||||
|
|
||||||
CPPUNIT_ASSERT_EQUAL(wxCHK_UNCHECKED, m_check->Get3StateValue());
|
CPPUNIT_ASSERT_EQUAL(wxCHK_UNCHECKED, m_check->Get3StateValue());
|
||||||
@@ -147,14 +146,12 @@ void CheckBoxTestCase::ThirdStateUser()
|
|||||||
void CheckBoxTestCase::InvalidStyles()
|
void CheckBoxTestCase::InvalidStyles()
|
||||||
{
|
{
|
||||||
// Check that using incompatible styles doesn't work.
|
// Check that using incompatible styles doesn't work.
|
||||||
wxDELETE( m_check );
|
|
||||||
WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_2STATE | wxCHK_3STATE) );
|
WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_2STATE | wxCHK_3STATE) );
|
||||||
#if !wxDEBUG_LEVEL
|
#if !wxDEBUG_LEVEL
|
||||||
CPPUNIT_ASSERT( !m_check->Is3State() );
|
CPPUNIT_ASSERT( !m_check->Is3State() );
|
||||||
CPPUNIT_ASSERT( !m_check->Is3rdStateAllowedForUser() );
|
CPPUNIT_ASSERT( !m_check->Is3rdStateAllowedForUser() );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxDELETE( m_check );
|
|
||||||
WX_ASSERT_FAILS_WITH_ASSERT(
|
WX_ASSERT_FAILS_WITH_ASSERT(
|
||||||
CreateCheckBox(wxCHK_2STATE | wxCHK_ALLOW_3RD_STATE_FOR_USER) );
|
CreateCheckBox(wxCHK_2STATE | wxCHK_ALLOW_3RD_STATE_FOR_USER) );
|
||||||
#if !wxDEBUG_LEVEL
|
#if !wxDEBUG_LEVEL
|
||||||
@@ -163,7 +160,6 @@ void CheckBoxTestCase::InvalidStyles()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// wxCHK_ALLOW_3RD_STATE_FOR_USER without wxCHK_3STATE doesn't work.
|
// wxCHK_ALLOW_3RD_STATE_FOR_USER without wxCHK_3STATE doesn't work.
|
||||||
wxDELETE( m_check );
|
|
||||||
WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_ALLOW_3RD_STATE_FOR_USER) );
|
WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_ALLOW_3RD_STATE_FOR_USER) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user