Dramatically optimise inserting many items in wxGenericListCtrl.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5376facc9d9d0ad97e4449da06827bfdda311b5b..ad027be38f6b9e5ab11f83ed5bf9e8b28e47c50c 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -529,15 +529,14 @@ typedef short int WXTYPE;
     #define wxDEPRECATED(x) x
 #endif
 
     #define wxDEPRECATED(x) x
 #endif
 

-/*
-    explicitly specifying inline allows gcc < 3.4 to
-    handle the deprecation attribute even in the constructor.
-    doesn't seem to work on Apple's gcc 4.0.1 unless using -O0
-*/
-#if wxCHECK_GCC_VERSION(3, 4) || defined( __DARWIN__ )
-    #define  wxDEPRECATED_CONSTRUCTOR(x) x
-#else
+#if defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 4)
+    /*
+        We need to add dummy "inline" to allow gcc < 3.4 to handle the
+        deprecation attribute on the constructors.
+    */

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

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

 #endif
 
 /*
 #endif
 
 /*


@@ -1953,12 +1952,12 @@ enum wxBorder
 #define wxICON_STOP             wxICON_HAND
 #define wxICON_ASTERISK         wxICON_INFORMATION
 
 #define wxICON_STOP             wxICON_HAND
 #define wxICON_ASTERISK         wxICON_INFORMATION
 

-#define  wxFORWARD              0x00001000
-#define  wxBACKWARD             0x00002000
-#define  wxRESET                0x00004000
-#define  wxHELP                 0x00008000
-#define  wxMORE                 0x00010000
-#define  wxSETUP                0x00020000
+#define wxHELP                  0x00001000
+#define wxFORWARD               0x00002000
+#define wxBACKWARD              0x00004000
+#define wxRESET                 0x00008000
+#define wxMORE                  0x00010000
+#define wxSETUP                 0x00020000

 #define wxICON_NONE             0x00040000
 
 #define wxICON_MASK \
 #define wxICON_NONE             0x00040000
 
 #define wxICON_MASK \