replace wxGetMultipleChoices() with wxGetSelectedChoices() which allows to distinguis...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 835eeae759ea64cca77dd19befe74b311ab5f36e..64bd994a807f7e080343c7a36d1d4454a81e98bb 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -503,7 +503,7 @@ typedef short int WXTYPE;
     handle the deprecation attribute even in the constructor.
     doesn't seem to work on Apple's gcc 4.0.1 unless using -O0
 */
     handle the deprecation attribute even in the constructor.
     doesn't seem to work on Apple's gcc 4.0.1 unless using -O0
 */

-#if defined( __DARWIN__ ) && !defined(__WXDEBUG__)
+#if wxCHECK_GCC_VERSION(3, 4) || defined( __DARWIN__ )

     #define  wxDEPRECATED_CONSTRUCTOR(x) x
 #else
     #define  wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)
     #define  wxDEPRECATED_CONSTRUCTOR(x) x
 #else
     #define  wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)


@@ -530,6 +530,17 @@ typedef short int WXTYPE;
 #   define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x)
 #endif
 
 #   define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x)
 #endif
 

+/*
+    Combination of the two variants above: should be used for deprecated
+    functions which are defined inline and are used by wxWidgets itself.
+ */
+#ifdef WXBUILDING
+#   define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) func { body }
+#else
+#   define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) \
+        wxDEPRECATED(func) { body }
+#endif
+

 /*  everybody gets the assert and other debug macros */
 #include "wx/debug.h"
 
 /*  everybody gets the assert and other debug macros */
 #include "wx/debug.h"
 


@@ -3134,6 +3145,11 @@ typedef const void* WXWidget;
         classname(const classname<arg>&);                 \
         classname& operator=(const classname<arg>&)
 
         classname(const classname<arg>&);                 \
         classname& operator=(const classname<arg>&)
 

+#define wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(classname, arg1, arg2) \
+    private:                                                      \
+        classname(const classname<arg1, arg2>&);                  \
+        classname& operator=(const classname<arg1, arg2>&)
+

 #define wxDECLARE_NO_ASSIGN_CLASS(classname)    \
     private:                                    \
         classname& operator=(const classname&)
 #define wxDECLARE_NO_ASSIGN_CLASS(classname)    \
     private:                                    \
         classname& operator=(const classname&)