More obsolete compatibility removed.

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

diff --git a/contrib/include/wx/deprecated/propform.h b/contrib/include/wx/deprecated/propform.h
index 15cb8c2b705d28fdba4e0e6f02f3dc8040bf9a27..21a06030d76fc22e1638446def2fbd36c063130f 100644 (file)
--- a/contrib/include/wx/deprecated/propform.h
+++ b/contrib/include/wx/deprecated/propform.h
@@ -145,12 +145,6 @@ class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator
   virtual void OnCommand( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
      wxWindow *WXUNUSED(parentWindow), wxCommandEvent& WXUNUSED(event) ) {}
 private:
-// Virtual function hiding suppression
-#if WXWIN_COMPATIBILITY_2
-    virtual void OnCommand(wxWindow& win,
-                           wxCommandEvent& event)
-    { wxEvtHandler::OnCommand(win, event); }
-#endif
 };
 
 /*

diff --git a/docs/todo30.txt b/docs/todo30.txt
index d02d035b41d9ab26f9dbf698d1026c7024b136b5..07c689df1a72ace8471b9ab51c30a2784eebe1a4 100644 (file)
--- a/docs/todo30.txt
+++ b/docs/todo30.txt
@@ -54,12 +54,11 @@ Core
     customized by user code by overriding some wxApp::CreateEventLoop())
     instead of duplicating the same code
 
-- remove wxCOMPATIBILITY (1.X)
-    At least WXWIN_COMPATIBILITY and maybe WXWIN_COMPATIBILITY_2 code should be
-    removed from the library. wxDEPRECATED() should be used with everything
-    inside WXWIN_COMPATIBILITY_2_2. The stuff inside WXWIN_COMPATIBILITY_2_4
-    probably should not be deprecated (yet?) because this would give thousands
-    of warnings for the existing code.
+- remove wxCOMPATIBILITY
+    wxDEPRECATED() should be used with everything inside WXWIN_COMPATIBILITY_2_4.
+    The stuff inside WXWIN_COMPATIBILITY_2_6 probably should not be deprecated
+    (yet?) because this would give thousands of warnings for the existing code.
+    Exception is api documented as obsolete in 2.6 release already.
 
 - Modularization/Build System
     Candidates for components:

diff --git a/utils/configtool/configs/wxwin250.wxs b/utils/configtool/configs/wxwin250.wxs
index 42e3c4c1ec0e355bc3395730c7f302b819f7945d..67337175981755918c8b94a394d3ace02fcbca7e 100644 (file)
--- a/utils/configtool/configs/wxwin250.wxs
+++ b/utils/configtool/configs/wxwin250.wxs
@@ -978,30 +978,8 @@ Default is 0. Recommended setting: 0 (in fact the compatibility code is now very
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>0</enabled>
-                <name>WXWIN_COMPATIBILITY_2</name>
-                <description>&lt;B&gt;This setting determines the compatibility with 2.0 API&lt;/B&gt;&lt;P&gt;
-
-Set it to 1 to enable it. Default is 0.&lt;P&gt;
-
-Recommended setting: 0 (please update your code instead!)
-</description>
-                <default-state>1</default-state>
-                <requires></requires>
-                <precludes></precludes>
-                <enabled-if></enabled-if>
-                <enabled-if-not></enabled-if-not>
-                <indeterminate-if></indeterminate-if>
-                <exclusivity></exclusivity>
-                <context></context>
-                <configure-command>--enable-compat20</configure-command>
-                <help-topic></help-topic>
-                <notes></notes>
-            </setting>
-            <setting type="bool-check">
-                <active>1</active>
-                <enabled>0</enabled>
-                <name>WXWIN_COMPATIBILITY_2_2</name>
-                <description>&lt;B&gt;This setting determines the compatibility with 2.2 API&lt;/B&gt;&lt;P&gt;
+                <name>WXWIN_COMPATIBILITY_2_4</name>
+                <description>&lt;B&gt;This setting determines the compatibility with 2.4 API&lt;/B&gt;&lt;P&gt;
 
 Set it to 1 to enable it but please consider updating your code instead.&lt;P&gt;
 
@@ -1022,8 +1000,8 @@ The default is 0. Recommended setting: 0 (please update your code)
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>0</enabled>
-                <name>WXWIN_COMPATIBILITY_2_4</name>
-                <description>&lt;B&gt;This setting determines the compatibility with 2.4 API&lt;/B&gt;&lt;P&gt;
+                <name>WXWIN_COMPATIBILITY_2_6</name>
+                <description>&lt;B&gt;This setting determines the compatibility with 2.6 API&lt;/B&gt;&lt;P&gt;
 
 Set it to 0 to flag all cases of using deprecated functions.&lt;P&gt;