put grid string in generic/grid.cpp, not common/datacmn.cpp

[wxWidgets.git] / include / wx / scopeguard.h

diff --git a/include/wx/scopeguard.h b/include/wx/scopeguard.h
index b8152964a0b3f2a919a05972e6a6f656f2a27015..0bb390d130aabff512557625ed3f188789cde7ec 100644 (file)
--- a/include/wx/scopeguard.h
+++ b/include/wx/scopeguard.h
@@ -336,7 +336,7 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
     wxScopeGuard n = wxMakeObjGuard(o, m); \
     wxPrivateUse(n)
 #define wxON_BLOCK_EXIT_OBJ0(o, m) \
     wxScopeGuard n = wxMakeObjGuard(o, m); \
     wxPrivateUse(n)
 #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_EXIT1_IMPL(n, f, p1) \
     wxScopeGuard n = wxMakeGuard(f, p1); \
 
 #define wxON_BLOCK_EXIT1_IMPL(n, f, p1) \
     wxScopeGuard n = wxMakeGuard(f, p1); \


@@ -348,7 +348,7 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
     wxScopeGuard n = wxMakeObjGuard(o, m, p1); \
     wxPrivateUse(n)
 #define wxON_BLOCK_EXIT_OBJ1(o, m, p1) \
     wxScopeGuard n = wxMakeObjGuard(o, m, p1); \
     wxPrivateUse(n)
 #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_EXIT2_IMPL(n, f, p1, p2) \
     wxScopeGuard n = wxMakeGuard(f, p1, p2); \
 
 #define wxON_BLOCK_EXIT2_IMPL(n, f, p1, p2) \
     wxScopeGuard n = wxMakeGuard(f, p1, p2); \


@@ -360,6 +360,6 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
     wxScopeGuard n = wxMakeObjGuard(o, m, p1, p2); \
     wxPrivateUse(n)
 #define wxON_BLOCK_EXIT_OBJ2(o, m, p1, p2) \
     wxScopeGuard n = wxMakeObjGuard(o, m, p1, p2); \
     wxPrivateUse(n)
 #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)

 
 #endif // _WX_SCOPEGUARD_H_
 
 #endif // _WX_SCOPEGUARD_H_