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

added convenient wxON_BLOCK_EXIT_THISn() macros wrapping wxON_BLOCK_EXIT_OBJn(*this)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-27 15:37:41 +00:00
parent eeb67742cd
commit 51c679d5e2
3 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/scopeguard.h
View File

@@ -346,6 +346,10 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
#define wxON_BLOCK_EXIT_OBJ0(o, m) \ #define wxON_BLOCK_EXIT_OBJ0(o, m) \
wxON_BLOCK_EXIT_OBJ0_IMPL(wxGuardName, o, &m) wxON_BLOCK_EXIT_OBJ0_IMPL(wxGuardName, o, &m)
#define wxON_BLOCK_EXIT_THIS0(m) \
wxON_BLOCK_EXIT_OBJ0(*this, m)
#define wxON_BLOCK_EXIT1_IMPL(n, f, p1) \ #define wxON_BLOCK_EXIT1_IMPL(n, f, p1) \
wxScopeGuard n = wxMakeGuard(f, p1); \ wxScopeGuard n = wxMakeGuard(f, p1); \
wxPrivateUse(n) wxPrivateUse(n)
@@ -358,6 +362,10 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
#define wxON_BLOCK_EXIT_OBJ1(o, m, p1) \ #define wxON_BLOCK_EXIT_OBJ1(o, m, p1) \
wxON_BLOCK_EXIT_OBJ1_IMPL(wxGuardName, o, &m, p1) wxON_BLOCK_EXIT_OBJ1_IMPL(wxGuardName, o, &m, p1)
#define wxON_BLOCK_EXIT_THIS1(m, p1) \
wxON_BLOCK_EXIT_OBJ1(*this, m, p1)
#define wxON_BLOCK_EXIT2_IMPL(n, f, p1, p2) \ #define wxON_BLOCK_EXIT2_IMPL(n, f, p1, p2) \
wxScopeGuard n = wxMakeGuard(f, p1, p2); \ wxScopeGuard n = wxMakeGuard(f, p1, p2); \
wxPrivateUse(n) wxPrivateUse(n)
@@ -370,4 +378,7 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
#define wxON_BLOCK_EXIT_OBJ2(o, m, p1, p2) \ #define wxON_BLOCK_EXIT_OBJ2(o, m, p1, p2) \
wxON_BLOCK_EXIT_OBJ2_IMPL(wxGuardName, o, &m, p1, p2) wxON_BLOCK_EXIT_OBJ2_IMPL(wxGuardName, o, &m, p1, p2)
#define wxON_BLOCK_EXIT_THIS2(m, p1, p2) \
wxON_BLOCK_EXIT_OBJ2(*this, m, p1, p2)
#endif // _WX_SCOPEGUARD_H_ #endif // _WX_SCOPEGUARD_H_

13
interface/scopeguard.h
View File

@@ -44,3 +44,16 @@
#define wxON_BLOCK_EXIT_OBJ2(object, method, p1, p2) #define wxON_BLOCK_EXIT_OBJ2(object, method, p1, p2)
//@} //@}
/** @ingroup group_funcmacro_misc */
//@{
/**
This family of macros is similar to wxON_BLOCK_OBJ0(), but calls a method
of @c this object instead of a method of the specified object.
@header{wx/scopeguard.h}
*/
#define wxON_BLOCK_EXIT_THIS0(method)
#define wxON_BLOCK_EXIT_THIS1(method, p1)
#define wxON_BLOCK_EXIT_THIS2(method, p1, p2)
//@}

34
tests/scopeguard/scopeguardtest.cpp
View File

@@ -60,12 +60,21 @@ public:
CPPUNIT_TEST(Dismiss); CPPUNIT_TEST(Dismiss);
CPPUNIT_TEST(BlockExit); CPPUNIT_TEST(BlockExit);
CPPUNIT_TEST(BlockExitObj); CPPUNIT_TEST(BlockExitObj);
CPPUNIT_TEST(BlockExitThis);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
void Normal(); void Normal();
void Dismiss(); void Dismiss();
void BlockExit(); void BlockExit();
void BlockExitObj(); void BlockExitObj();
void BlockExitThis();
private:
void Zero() { m_count = 0; }
void Set(int n) { m_count = n; }
void Sum(int n, int m) { m_count = n + m; }
int m_count;
}; };
// register in the unnamed registry so that these tests are run by default // register in the unnamed registry so that these tests are run by default
@@ -172,3 +181,28 @@ void ScopeGuardTestCase::BlockExitObj()
CPPUNIT_ASSERT_EQUAL( 5, count2.GetCount() ); CPPUNIT_ASSERT_EQUAL( 5, count2.GetCount() );
} }
void ScopeGuardTestCase::BlockExitThis()
{
m_count = 1;
{
wxON_BLOCK_EXIT_THIS0(ScopeGuardTestCase::Zero);
CPPUNIT_ASSERT_EQUAL( 1, m_count );
}
CPPUNIT_ASSERT_EQUAL( 0, m_count );
{
wxON_BLOCK_EXIT_THIS1(ScopeGuardTestCase::Set, 17);
CPPUNIT_ASSERT_EQUAL( 0, m_count );
}
CPPUNIT_ASSERT_EQUAL( 17, m_count );
{
wxON_BLOCK_EXIT_THIS2(ScopeGuardTestCase::Sum, 2, 3);
CPPUNIT_ASSERT_EQUAL( 17, m_count );
}
CPPUNIT_ASSERT_EQUAL( 5, m_count );
}