added WXWIN_COMPATIBILITY_2_8

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

diff --git a/configure b/configure
index 08d853f7d271f5fcdb16979b8a5a56e695b9cda1..eafae361221f34d5a63bfa453de71befc3baba77 100755 (executable)
--- a/configure
+++ b/configure
@@ -1626,7 +1626,8 @@ Optional Features:
   --disable-vararg_macros don't use vararg macros, even if they are supported
   --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)
   --enable-compat24       enable wxWidgets 2.4 compatibility
-  --disable-compat26      disable wxWidgets 2.6 compatibility
+  --enable-compat26       enable wxWidgets 2.6 compatibility
+  --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-intl           use internationalization system
   --enable-config         use wxConfig (and derived) classes
@@ -5230,7 +5231,7 @@ echo "${ECHO_T}no" >&6; }
           fi
 
 
-          enablestring=disable
+          enablestring=enable
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
           no_cache=0
@@ -5271,6 +5272,47 @@ echo "${ECHO_T}no" >&6; }
           fi
 
 
+          enablestring=disable
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-compat28 was given.
+if test "${enable_compat28+set}" = set; then
+  enableval=$enable_compat28;
+                          if test "$enableval" = yes; then
+                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
+                          else
+                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
+                          fi
+
+else
+
+                          LINE=`grep "WXWIN_COMPATIBILITY_2_8" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8='$DEFAULT_WXWIN_COMPATIBILITY_2_8
+
+fi
+
+
+          eval "$ac_cv_use_compat28"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WXWIN_COMPATIBILITY_2_8" = yes; then
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+          else
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+          fi
+
+
 
           enablestring=
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
@@ -47899,11 +47941,20 @@ _ACEOF
     WXWIN_COMPATIBILITY_2_6="yes"
 fi
 
-if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then
+if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
     cat >>confdefs.h <<\_ACEOF
 #define WXWIN_COMPATIBILITY_2_6 1
 _ACEOF
 
+
+    WXWIN_COMPATIBILITY_2_8="yes"
+fi
+
+if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
+    cat >>confdefs.h <<\_ACEOF
+#define WXWIN_COMPATIBILITY_2_8 1
+_ACEOF
+
 fi
 
 
@@ -59152,6 +59203,7 @@ echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:
 echo "  What level of wxWidgets compatibility should be enabled?"
 echo "                                       wxWidgets 2.4      ${WXWIN_COMPATIBILITY_2_4:-no}"
 echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-yes}"
+echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"

diff --git a/configure.in b/configure.in
index 18be81f7f95b2d928307c865fa4d381e3a8252fd..c35a148401cef1b9de385b7be404f7fd572d5e19 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -938,7 +938,8 @@ WX_ARG_ENABLE(vararg_macros, [  --disable-vararg_macros don't use vararg macros,
 WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)]], wxUSE_UNIVERSAL_BINARY)
 
 WX_ARG_ENABLE(compat24,      [  --enable-compat24       enable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, enable)
-WX_ARG_ENABLE(compat26,      [  --disable-compat26      disable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6, disable)
+WX_ARG_ENABLE(compat26,      [  --enable-compat26       enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6, enable)
+WX_ARG_ENABLE(compat28,      [  --disable-compat28      disable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8, disable)
 
 WX_ARG_ENABLE(rpath,         [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
 
@@ -5557,8 +5558,14 @@ if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
     WXWIN_COMPATIBILITY_2_6="yes"
 fi
 
-if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then
+if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
     AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
+
+    WXWIN_COMPATIBILITY_2_8="yes"
+fi
+
+if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
+    AC_DEFINE(WXWIN_COMPATIBILITY_2_8)
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -8127,6 +8134,7 @@ echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:
 echo "  What level of wxWidgets compatibility should be enabled?"
 echo "                                       wxWidgets 2.4      ${WXWIN_COMPATIBILITY_2_4:-no}"
 echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-yes}"
+echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index d3a28ed957932b5594327cf6a8f47bfaae279492..fff13de7b3e03d49b433eca482762d270b4360e6 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -44,7 +44,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index d4fa16afac4ba26a496dd9c29d3c125b6ca4795d..095bcca33d72dbdcc248ba4bba312d18e01d0844 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -43,7 +43,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index e2133de04870b701600171b9786ca3e07abc26a4..54d883ecee57f09184c0f54dfb19a6b7bea6300d 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -43,7 +43,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 22c30933f0a41a9e796ab147aa0628e1385b308e..680238170c03a763270dbbd42e3eac3fc1919078 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -43,7 +43,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 985a20e9c46897f69a4c996e7a4b6e59b1a82ef0..94150df4d18049aa50b877846df96aa205069942 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -43,7 +43,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index e57ca006a10b8f350b2934928d833c528ce625f2..32e15a57e74eca801c72c7116395dc767c914b25 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -43,7 +43,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 18ec6398fc26cf7eb407a8f2eeddb8a640c4ebba..d72c8f3c33a03c268bf9b74175495a7d3bf68e86 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -39,7 +39,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 6f4f29b25ee2dace7bd57d97d6389701ed51982b..c3ea331b2f9f9cce5fcb869911f77793250d2345 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -42,7 +42,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 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_8 1
 
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.

diff --git a/setup.h.in b/setup.h.in
index b9ba86f943e3440c78612e9d3b8d7e4524ca2f62..f21c9053983f33d22b747d8b3d94659251f8a4d0 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -152,6 +152,8 @@
 
 #define WXWIN_COMPATIBILITY_2_6 0
 
+#define WXWIN_COMPATIBILITY_2_8 0
+
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 

diff --git a/setup.h_vms b/setup.h_vms
index 96a8354d1705a96b1f868c8bf3d1578b544675aa..2de279f93ac3cb1d62ae0deea9bb447f65423406 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -168,6 +168,8 @@ typedef pid_t GPid;
 
 #define WXWIN_COMPATIBILITY_2_6 1
 
+#define WXWIN_COMPATIBILITY_2_8 1
+
 #define wxDIALOG_UNIT_COMPATIBILITY   1