added WXWIN_COMPATIBILITY_2_4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 5f5157bb1b0192f9799a6e90e3b1204aff8af851..31197d875a1e56f68e31b3743d213753b9a82730 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -47,10 +47,20 @@
 // This setting determines the compatibility with 2.0 API: set it to 1 to
 // enable it
 //
-// Default is 1.
+// Default is 0.
 //
 // Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2_2 1
+#define WXWIN_COMPATIBILITY_2_2 0
+
+// This setting determines the compatibility with 2.2 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_2_4 1
 
 // in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
 // but this is very dangerous because you can mistakenly pass an icon instead

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 6b8d5974f152d28643c8c6c311e75cc25bdcd5f5..2aa7c461d326bc4b6c0693b79b39cab09a6f5428 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -44,13 +44,23 @@
 // Recommended setting: 0 (please update your code instead!)
 #define WXWIN_COMPATIBILITY_2 0
 
+// This setting determines the compatibility with 2.2 API: set it to 1 to
+// enable it but please consider to update your code instead of doing it.
+//
+// Default is 0
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_2_2 1
+
 // This setting determines the compatibility with 2.2 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
-// Default is 1 but please try building your code with 0.
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_2 1
+#define WXWIN_COMPATIBILITY_2_4 1
 
 // in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
 // but this is very dangerous because you can mistakenly pass an icon instead

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 2b559772bfa3087f33a1b0c61bab2f831971af01..cb69d3bcdc101cc980e2b40ca622c3e68cdebc53 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -47,11 +47,21 @@
 // This setting determines the compatibility with 2.0 API: set it to 1 to
 // enable it
 //
-// Default is 1.
+// Default is 0.
 //
 // Recommended setting: 0 (please update your code instead!)
 #define WXWIN_COMPATIBILITY_2_2 0
 
+// This setting determines the compatibility with 2.2 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_2_4 1
+
 // in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
 // but this is very dangerous because you can mistakenly pass an icon instead
 // of a bitmap to a function taking "const wxBitmap&" - which will *not* work

diff --git a/setup.h.in b/setup.h.in
index c23890090257836084c8b7f51d3723cde375f6a0..66623007768825d066eacc4b709ae28dcbcf69b2 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -747,6 +747,10 @@
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 0
+/*
+ * Compatibility with 2.4 API
+ */
+#define WXWIN_COMPATIBILITY_2_4 0
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */

diff --git a/setup.h_vms b/setup.h_vms
index fe9ca28073d1880d52b2cc91effacc8f6d43a5f4..43530a6b234f4d1e030107eeba238cc96456df77 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -772,7 +772,11 @@
 /*
  * Compatibility with 2.2 API
  */
-#define WXWIN_COMPATIBILITY_2_2 1
+#define WXWIN_COMPATIBILITY_2_2 0
+/*
+ * Compatibility with 2.4 API
+ */
+#define WXWIN_COMPATIBILITY_2_4 1
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */