projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. derived wxMSW radio box from static box because it includes the box anyhow
[wxWidgets.git]
/
include
/
wx
/
ptr_scpd.h
diff --git
a/include/wx/ptr_scpd.h
b/include/wx/ptr_scpd.h
index 0804211086c70ce2ad1a3c35d4a5b6dab2a6b885..85427a13cfcfbef4bb9d06e6e5ceec99dad802e4 100644
(file)
--- a/
include/wx/ptr_scpd.h
+++ b/
include/wx/ptr_scpd.h
@@
-40,26
+40,27
@@
*/
#ifdef __WATCOMC__
*/
#ifdef __WATCOMC__
- #define wxPRE_NO_WARNING_SCOPE for(int i=0;i<1;i++)
- #define wxPOST_NO_WARNING_SCOPE
+ #define wxFOR_ONCE(name) for(int name=0; name<1; name++)
+ #define wxPRE_NO_WARNING_SCOPE(name) wxFOR_ONCE(wxMAKE_UNIQUE_NAME(name))
+ #define wxPOST_NO_WARNING_SCOPE(name)
#else
#else
- #define wxPRE_NO_WARNING_SCOPE do
- #define wxPOST_NO_WARNING_SCOPE while ( 0 )
+ #define wxPRE_NO_WARNING_SCOPE
(name)
do
+ #define wxPOST_NO_WARNING_SCOPE
(name)
while ( 0 )
#endif
#define wxCHECKED_DELETE(ptr) \
#endif
#define wxCHECKED_DELETE(ptr) \
- wxPRE_NO_WARNING_SCOPE
\
+ wxPRE_NO_WARNING_SCOPE
(scope_var1)
\
{ \
typedef char complete[sizeof(*ptr)]; \
delete ptr; \
{ \
typedef char complete[sizeof(*ptr)]; \
delete ptr; \
- } wxPOST_NO_WARNING_SCOPE
+ } wxPOST_NO_WARNING_SCOPE
(scope_var1)
#define wxCHECKED_DELETE_ARRAY(ptr) \
#define wxCHECKED_DELETE_ARRAY(ptr) \
- wxPRE_NO_WARNING_SCOPE
\
+ wxPRE_NO_WARNING_SCOPE
(scope_var2)
\
{ \
typedef char complete[sizeof(*ptr)]; \
delete [] ptr; \
{ \
typedef char complete[sizeof(*ptr)]; \
delete [] ptr; \
- } wxPOST_NO_WARNING_SCOPE
+ } wxPOST_NO_WARNING_SCOPE
(scope_var2)
/* These scoped pointers are *not* assignable and cannot be used
within a container. Look for wxDECLARE_SHARED_PTR for this
/* These scoped pointers are *not* assignable and cannot be used
within a container. Look for wxDECLARE_SHARED_PTR for this