Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/checkeddelete.h b/include/wx/checkeddelete.h
index a9e14c3a2e560ccc0dde53e125eac2fd36837a8f..d77abd7cce9b6248d13dcf2184d1b4d64f33a5a0 100644 (file)
--- a/include/wx/checkeddelete.h
+++ b/include/wx/checkeddelete.h
@@ -11,6 +11,8 @@
 #ifndef _WX_CHECKEDDELETE_H_
 #define _WX_CHECKEDDELETE_H_
 
+#include "wx/cpp.h"
+
 // TODO: provide wxCheckedDelete[Array]() template functions too
 
 // ----------------------------------------------------------------------------
@@ -26,28 +28,17 @@
    still force a semicolon after the macro
 */
 
-#ifdef __WATCOMC__
-    #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
-    #define wxPRE_NO_WARNING_SCOPE(name)  do
-    #define wxPOST_NO_WARNING_SCOPE(name) while ( wxFalse )
-#endif
-
 #define wxCHECKED_DELETE(ptr)                                                 \
-    wxPRE_NO_WARNING_SCOPE(scope_var1)                                        \
-    {                                                                         \
-        typedef char complete[sizeof(*ptr)];                                  \
+    wxSTATEMENT_MACRO_BEGIN                                                   \
+        typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED;              \
         delete ptr;                                                           \
-    } wxPOST_NO_WARNING_SCOPE(scope_var1)
+    wxSTATEMENT_MACRO_END
 
 #define wxCHECKED_DELETE_ARRAY(ptr)                                           \
-    wxPRE_NO_WARNING_SCOPE(scope_var2)                                        \
-    {                                                                         \
-        typedef char complete[sizeof(*ptr)];                                  \
+    wxSTATEMENT_MACRO_BEGIN                                                   \
+        typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED;              \
         delete [] ptr;                                                        \
-    } wxPOST_NO_WARNING_SCOPE(scope_var2)
+    wxSTATEMENT_MACRO_END
 
 
 #endif // _WX_CHECKEDDELETE_H_