projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented PocketPC menubar/toolbar as wxToolMenuBar derived
[wxWidgets.git]
/
include
/
wx
/
scopeguard.h
diff --git
a/include/wx/scopeguard.h
b/include/wx/scopeguard.h
index 21719fb017c593ba6469ed296acc9b7852c339a4..c46f4435699c98172bddcf75c7aa16c5e8d28812 100644
(file)
--- a/
include/wx/scopeguard.h
+++ b/
include/wx/scopeguard.h
@@
-32,7
+32,7
@@
namespace wxPrivate
// ScopeGuardImplBase but gcc 2.8 which is still used for OS/2 doesn't
// support member templates and so we must make it global
template <typename ScopeGuardImpl>
// ScopeGuardImplBase but gcc 2.8 which is still used for OS/2 doesn't
// support member templates and so we must make it global
template <typename ScopeGuardImpl>
- void OnScopeExit(ScopeGuardImpl& guard)
+ void OnScopeExit(ScopeGuardImpl& guard)
{
if ( !guard.WasDismissed() )
{
{
if ( !guard.WasDismissed() )
{
@@
-51,7
+51,7
@@
namespace wxPrivate
{
}
} // namespace wxPrivate
{
}
} // namespace wxPrivate
-
+
// ============================================================================
// wxScopeGuard for functions and functors
// ============================================================================
// ============================================================================
// wxScopeGuard for functions and functors
// ============================================================================
@@
-73,7
+73,7
@@
public:
protected:
~wxScopeGuardImplBase() { }
protected:
~wxScopeGuardImplBase() { }
- wxScopeGuardImplBase(const wxScopeGuardImplBase& other)
+ wxScopeGuardImplBase(const wxScopeGuardImplBase& other)
: m_wasDismissed(other.m_wasDismissed)
{
other.Dismiss();
: m_wasDismissed(other.m_wasDismissed)
{
other.Dismiss();
@@
-111,7
+111,7
@@
protected:
wxScopeGuardImpl0& operator=(const wxScopeGuardImpl0&);
};
wxScopeGuardImpl0& operator=(const wxScopeGuardImpl0&);
};
-template <typename F>
+template <typename F>
inline wxScopeGuardImpl0<F> wxMakeGuard(F fun)
{
return wxScopeGuardImpl0<F>::MakeGuard(fun);
inline wxScopeGuardImpl0<F> wxMakeGuard(F fun)
{
return wxScopeGuardImpl0<F>::MakeGuard(fun);
@@
-143,7
+143,7
@@
protected:
wxScopeGuardImpl1& operator=(const wxScopeGuardImpl1&);
};
wxScopeGuardImpl1& operator=(const wxScopeGuardImpl1&);
};
-template <typename F, typename P1>
+template <typename F, typename P1>
inline wxScopeGuardImpl1<F, P1> wxMakeGuard(F fun, P1 p1)
{
return wxScopeGuardImpl1<F, P1>::MakeGuard(fun, p1);
inline wxScopeGuardImpl1<F, P1> wxMakeGuard(F fun, P1 p1)
{
return wxScopeGuardImpl1<F, P1>::MakeGuard(fun, p1);
@@
-233,7
+233,7
@@
public:
void Execute() { (m_obj.*m_memfun)(m_p1); }
protected:
void Execute() { (m_obj.*m_memfun)(m_p1); }
protected:
- wxObjScopeGuardImpl1(Obj& obj, MemFun memFun, P1 p1)
+ wxObjScopeGuardImpl1(Obj& obj, MemFun memFun, P1 p1)
: m_obj(obj), m_memfun(memFun), m_p1(p1) { }
Obj& m_obj;
: m_obj(obj), m_memfun(memFun), m_p1(p1) { }
Obj& m_obj;
@@
-263,7
+263,7
@@
public:
void Execute() { (m_obj.*m_memfun)(m_p1, m_p2); }
protected:
void Execute() { (m_obj.*m_memfun)(m_p1, m_p2); }
protected:
- wxObjScopeGuardImpl2(Obj& obj, MemFun memFun, P1 p1, P2 p2)
+ wxObjScopeGuardImpl2(Obj& obj, MemFun memFun, P1 p1, P2 p2)
: m_obj(obj), m_memfun(memFun), m_p1(p1), m_p2(p2) { }
Obj& m_obj;
: m_obj(obj), m_memfun(memFun), m_p1(p1), m_p2(p2) { }
Obj& m_obj;