projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct properties were not set during initial add somehow
[wxWidgets.git]
/
samples
/
text
/
textM5.xml
diff --git
a/samples/text/textM5.xml
b/samples/text/textM5.xml
index 2decea40f044ff5373e5c9e0ba97d7b972b34bc4..4fc2f3005033fcd77ddf7b0faffde09ec17d3c2a 100644
(file)
--- a/
samples/text/textM5.xml
+++ b/
samples/text/textM5.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>
\10
zö@
</VALUE></SETTING>
- <SETTING><VALUE>
\11
%#
H</VALUE></SETTING>
- <SETTING><VALUE>
\11
%8*
</VALUE></SETTING>
+ <SETTING><VALUE>
\b
\94
ÂP
</VALUE></SETTING>
+ <SETTING><VALUE>
=Ã
H</VALUE></SETTING>
+ <SETTING><VALUE>
=Ø:
</VALUE></SETTING>
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
@@
-1456,9
+1456,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>
\10
zö@
</VALUE></SETTING>
- <SETTING><VALUE>
\11
%#
H</VALUE></SETTING>
- <SETTING><VALUE>
\11
%8*
</VALUE></SETTING>
+ <SETTING><VALUE>
\b
\94
ÂP
</VALUE></SETTING>
+ <SETTING><VALUE>
=Ã
H</VALUE></SETTING>
+ <SETTING><VALUE>
=Ø:
</VALUE></SETTING>
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
@@
-2424,9
+2424,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>
\10
zö@
</VALUE></SETTING>
- <SETTING><VALUE>
\11
%#
H</VALUE></SETTING>
- <SETTING><VALUE>
\11
%8*
</VALUE></SETTING>
+ <SETTING><VALUE>
\b
\94
ÂP
</VALUE></SETTING>
+ <SETTING><VALUE>
=Ã
H</VALUE></SETTING>
+ <SETTING><VALUE>
=Ø:
</VALUE></SETTING>
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
@@
-2620,6
+2620,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>
@@
-2682,6
+2689,11
@@
<PATH>CarbonLib</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<PATH>CarbonLib</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
+ <FILEREF>
+ <PATHTYPE>Name</PATHTYPE>
+ <PATH>CarbonFrameworkLib</PATH>
+ <PATHFORMAT>MacOS</PATHFORMAT>
+ </FILEREF>
</LINKORDER>
</TARGET>
<TARGET>
</LINKORDER>
</TARGET>
<TARGET>
@@
-3116,9
+3128,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>
\10
zö@
</VALUE></SETTING>
- <SETTING><VALUE>
\11
%#
H</VALUE></SETTING>
- <SETTING><VALUE>
\11
%8*
</VALUE></SETTING>
+ <SETTING><VALUE>
\b
\94
ÂP
</VALUE></SETTING>
+ <SETTING><VALUE>
=Ã
H</VALUE></SETTING>
+ <SETTING><VALUE>
=Ø:
</VALUE></SETTING>
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
</SETTING>
<!-- Settings for "PPC CodeGen" panel -->
@@
-3312,6
+3324,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>
@@
-3374,6
+3393,11
@@
<PATH>CarbonLib</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<PATH>CarbonLib</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
+ <FILEREF>
+ <PATHTYPE>Name</PATHTYPE>
+ <PATH>CarbonFrameworkLib</PATH>
+ <PATHFORMAT>MacOS</PATHFORMAT>
+ </FILEREF>
</LINKORDER>
</TARGET>
</TARGETLIST>
</LINKORDER>
</TARGET>
</TARGETLIST>
@@
-3502,6
+3526,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>