revert r59246; the window parameter was there by purpose (i.e. for consistency with...

[wxWidgets.git] / demos / forty / fortyM5.xml

diff --git a/demos/forty/fortyM5.xml b/demos/forty/fortyM5.xml
index ebfed8b402878bbfb73d2fdc6b351698e5ccdea4..584f6f765b4486fce1c15c046a7b046ef4b95c4b 100644 (file)
--- a/demos/forty/fortyM5.xml
+++ b/demos/forty/fortyM5.xml
@@ -480,9 +480,9 @@
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>

-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\11@\80ø</VALUE></SETTING>
-                    <SETTING><VALUE></VALUE></SETTING>
+                    <SETTING><VALUE>\b\95i@</VALUE></SETTING>
+                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
+                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>

                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->
                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->


@@ -879,6 +879,13 @@
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>

+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>Textension</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Library</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>

             </FILELIST>
             <LINKORDER>
                 <FILEREF>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>


@@ -1086,6 +1093,11 @@
                     <PATH>DragLib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                     <PATH>DragLib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>

+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>Textension</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>

             </LINKORDER>
         </TARGET>
         <TARGET>
             </LINKORDER>
         </TARGET>
         <TARGET>


@@ -1528,9 +1540,9 @@
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>

-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\11@\80ø</VALUE></SETTING>
-                    <SETTING><VALUE></VALUE></SETTING>
+                    <SETTING><VALUE>\b\95i@</VALUE></SETTING>
+                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
+                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>

                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->
                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->


@@ -1927,6 +1939,13 @@
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>

+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>Textension</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Library</FILEKIND>
+                    <FILEFLAGS>Debug</FILEFLAGS>
+                </FILE>

             </FILELIST>
             <LINKORDER>
                 <FILEREF>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>


@@ -2134,6 +2153,11 @@
                     <PATH>zlibd.lib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                     <PATH>zlibd.lib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>

+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>Textension</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>

             </LINKORDER>
         </TARGET>
         <TARGET>
             </LINKORDER>
         </TARGET>
         <TARGET>


@@ -2568,9 +2592,9 @@
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>

-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\11@\80ø</VALUE></SETTING>
-                    <SETTING><VALUE></VALUE></SETTING>
+                    <SETTING><VALUE>\b\95i@</VALUE></SETTING>
+                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
+                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>

                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->
                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->


@@ -2813,6 +2837,13 @@
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>

+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>CarbonFrameworkLib</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Library</FILEKIND>
+                    <FILEFLAGS>Debug</FILEFLAGS>
+                </FILE>

             </FILELIST>
             <LINKORDER>
                 <FILEREF>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>


@@ -2910,6 +2941,11 @@
                     <PATH>zlibd.lib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                     <PATH>zlibd.lib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>

+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>CarbonFrameworkLib</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>

             </LINKORDER>
         </TARGET>
         <TARGET>
             </LINKORDER>
         </TARGET>
         <TARGET>


@@ -3344,9 +3380,9 @@
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>

-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\11@\80ø</VALUE></SETTING>
-                    <SETTING><VALUE></VALUE></SETTING>
+                    <SETTING><VALUE>\b\95i@</VALUE></SETTING>
+                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
+                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>

                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->
                 </SETTING>
 
                 <!-- Settings for "PPC CodeGen" panel -->


@@ -3589,6 +3625,13 @@
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>

+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>CarbonFrameworkLib</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Library</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>

             </FILELIST>
             <LINKORDER>
                 <FILEREF>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>


@@ -3686,6 +3729,11 @@
                     <PATH>png.lib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                     <PATH>png.lib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>

+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>CarbonFrameworkLib</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>

             </LINKORDER>
         </TARGET>
     </TARGETLIST>
             </LINKORDER>
         </TARGET>
     </TARGETLIST>


@@ -3748,15 +3796,15 @@
         </FILEREF>
         <GROUP><NAME>wx</NAME>
             <FILEREF>
         </FILEREF>
         <GROUP><NAME>wx</NAME>
             <FILEREF>

-                <TARGETNAME>Carbon Debug</TARGETNAME>
+                <TARGETNAME>Carbon Release</TARGETNAME>

                 <PATHTYPE>Name</PATHTYPE>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>wx_CARBON_d.lib</PATH>
+                <PATH>wx_CARBON.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>

-                <TARGETNAME>Carbon Release</TARGETNAME>
+                <TARGETNAME>Carbon Debug</TARGETNAME>

                 <PATHTYPE>Name</PATHTYPE>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>wx_CARBON.lib</PATH>
+                <PATH>wx_CARBON_d.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>


@@ -3766,15 +3814,15 @@
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>

-                <TARGETNAME>Classic Debug</TARGETNAME>
+                <TARGETNAME>Classic Release</TARGETNAME>

                 <PATHTYPE>Name</PATHTYPE>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>wx_PPC_d.lib</PATH>
+                <PATH>wx_PPC.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>

-                <TARGETNAME>Classic Release</TARGETNAME>
+                <TARGETNAME>Classic Debug</TARGETNAME>

                 <PATHTYPE>Name</PATHTYPE>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>wx_PPC.lib</PATH>
+                <PATH>wx_PPC_d.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>


@@ -3872,6 +3920,12 @@
                     <PATH>CarbonLib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                     <PATH>CarbonLib</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>

+                <FILEREF>
+                    <TARGETNAME>Carbon Debug</TARGETNAME>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>CarbonFrameworkLib</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>

             </GROUP>
             <GROUP><NAME>Classic</NAME>
                 <FILEREF>
             </GROUP>
             <GROUP><NAME>Classic</NAME>
                 <FILEREF>


@@ -4000,6 +4054,12 @@
                     <PATH>TextEncodingConverter</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                     <PATH>TextEncodingConverter</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>

+                <FILEREF>
+                    <TARGETNAME>Classic Release</TARGETNAME>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>Textension</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>

                 <FILEREF>
                     <TARGETNAME>Classic Release</TARGETNAME>
                     <PATHTYPE>Name</PATHTYPE>
                 <FILEREF>
                     <TARGETNAME>Classic Release</TARGETNAME>
                     <PATHTYPE>Name</PATHTYPE>