hacked around wxGTK wxStaticText which doesn't derive from wxStaticTextBase (argh...

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

diff --git a/include/wx/ptr_scpd.h b/include/wx/ptr_scpd.h
index 0804211086c70ce2ad1a3c35d4a5b6dab2a6b885..9f7c88de4bb8002da80d20c354b92abe2177d79f 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


@@ -137,8 +138,8 @@ name::~name()                       \
 // this macro can be used for the most common case when you want to declare and
 // define the scoped pointer at the same time and want to use the standard
 // naming convention: auto pointer to Foo is called FooPtr
 // this macro can be used for the most common case when you want to declare and
 // define the scoped pointer at the same time and want to use the standard
 // naming convention: auto pointer to Foo is called FooPtr

-#define wxDEFINE_SCOPED_PTR_TYPE(T)                                           \
-    wxDECLARE_SCOPED_PTR(T, T ## Ptr);                                        \
+#define wxDEFINE_SCOPED_PTR_TYPE(T)    \
+    wxDECLARE_SCOPED_PTR(T, T ## Ptr)  \

     wxDEFINE_SCOPED_PTR(T, T ## Ptr)
 
 // the same but for arrays instead of simple pointers
     wxDEFINE_SCOPED_PTR(T, T ## Ptr)
 
 // the same but for arrays instead of simple pointers