merge #4 from 2.6 branch

[wxWidgets.git] / utils / configtool / configs / wxwin250.wxs

diff --git a/utils/configtool/configs/wxwin250.wxs b/utils/configtool/configs/wxwin250.wxs
index f705fe06be9424a666a0b4d3fae438150ba2634b..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;
 
@@ -1044,28 +1022,6 @@ Recommended setting: 0 (please update your code)
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>1</active>
-                <enabled>1</enabled>
-                <name>wxFONT_SIZE_COMPATIBILITY</name>
-                <description>&lt;B&gt;Define as 1 for font size to be backward compatible to 1.63 and earlier.&lt;/B&gt;&lt;P&gt;
-
-1.64 and later define point sizes to be compatible with Windows.&lt;P&gt;
-
-Default is 0.
-</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>__WXMSW__</context>
-                <configure-command></configure-command>
-                <help-topic>wxFont</help-topic>
-                <notes></notes>
-            </setting>
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>1</enabled>
@@ -3215,28 +3171,6 @@ wxColourDialog and wxDirDialog.</description>
             <configure-command></configure-command>
             <help-topic>Common dialogs overview</help-topic>
             <notes></notes>
-            <setting type="bool-check">
-                <active>1</active>
-                <enabled>0</enabled>
-                <name>wxUSE_GENERIC_DIALOGS_IN_MSW</name>
-                <description>&lt;B&gt;Generic dialog support in Windows&lt;/B&gt;&lt;P&gt;
-
-Define 1 to use generic dialogs in Windows, even though they duplicate native common dialog (e.g. wxColourDialog). This is mainly useful for testing.&lt;P&gt;
-
-Default: 0. Recommended setting: 0
-</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></configure-command>
-                <help-topic>Common dialogs overview</help-topic>
-                <notes></notes>
-            </setting>
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>1</enabled>
@@ -3803,8 +3737,8 @@ A class for setting miscellaneous options that do not fit in with the wxWindows
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>1</enabled>
-                <name>wxUSE_WAVE</name>
-                <description>&lt;B&gt;wxWave&lt;/B&gt;&lt;P&gt;
+                <name>wxUSE_SOUND</name>
+                <description>&lt;B&gt;wxSound&lt;/B&gt;&lt;P&gt;
 
 Simple .wav class for short sounds.</description>
                 <default-state>1</default-state>
@@ -3815,8 +3749,8 @@ Simple .wav class for short sounds.</description>
                 <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--enable-wave</configure-command>
-                <help-topic>wxWave</help-topic>
+                <configure-command>--enable-sound</configure-command>
+                <help-topic>wxSound</help-topic>
                 <notes></notes>
             </setting>
             <setting type="bool-check">