X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e4dc03dcce4f881bcf8ca3586128ddf40ba0eea..86c529a9d4d0af5c2156d32c79e066a598b5c0b1:/docs/html/faqmac.htm

diff --git a/docs/html/faqmac.htm b/docs/html/faqmac.htm
index 61fa399ff6..4896e7e599 100644
--- a/docs/html/faqmac.htm
+++ b/docs/html/faqmac.htm
@@ -25,38 +25,31 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <hr>
 <h3>List of questions in this category</h3>
 <ul>
-<li><a href="#release">When is wxMac 2.x due to be released?</a></li>
+<li><a href="#release">Where should I download wxMac from?</a></li>
 <li><a href="#macplat">Which Mac platforms are supported?</a></li>
 <li><a href="#macosx">How is the Mac OS X port different from the Classic Mac OS port?</a></li>
-<li><a href="#macclassic">How are improvements to the Classic Mac OS port integra ted into the Mac OS X port?</a></li>
+<li><a href="#macclassic">How are improvements to the Classic Mac OS port integrated into the Mac OS X port?</a></li>
 <li><a href="#compilers">What compilers are supported?</a></li>
 <li><a href="#filetypes">How does CVS handle file types/creators under Mac OS 8.x /9.x?</a></li>
 <li><a href="#filetypesx">How does CVS handle file types/creators under Mac OS X? </a></li>
 <li><a href="#cwpro53">What steps are required to build wxMac using CodeWarrior P ro 5.3?</a></li>
 <li><a href="#buildx">What steps are required to build wxMac under Mac OS X?</a></li>
-<li><a href="#settings">What important settings are required in the CodeWarrior P roject Preferences?</a></li>
+<li><a href="#settings">What important settings are required in the CodeWarrior Project Preferences?</a></li>
 <li><a href="#smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></li>
 <li><a href="#aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></li>
+<li><a href="#findericon">How do I add an icon to my application?</a></li>
+<li><a href="#switching">How can I easily switch between different versions of wxWindows in CodeWarrior?</a></li>
 </ul>
 <hr>
-<h3><a name="release">When is wxMac 2.x due to be released?</a></h3>
 
-There is a <a href="dl_mac2.htm">preview</a> available.
-The author of this port is <a href="mailto:csomor@advancedconcepts.ch">Stefan Csomor</a>.
-<P>
-
-<table border=0 cellpadding=5>
-<tr>
-<td bgcolor="#004080">
-<font face="Arial, Lucida Sans, Helvetica">
-<font size=2>
-Please note that the version of wxMac in CVS is more robust and nearly feature-complete compared with the packaged 2.0 release.
-Until a new release is made, it is recommended that you download the wxMac 2.3.1 <a href="dl_mac2.htm#dev">development snapshot</a> or the sources from the <a href="cvs.htm">CVS trunk</a>.
-</font>
-</font></td>
-</tr>
-</table>
+<h3><a name="release">Where should I download wxMac from?</a></h3>
 
+Please see the <a href="dl_mac2.htm">downloads page</a>.
+The version of wxMac in CVS advances quickly so it is recommended that you download the
+the sources from the <a href="cvs.htm">CVS trunk</a>.
+There is also a wxMac 2.3.1 <a href="dl_mac2.htm#dev">development snapshot</a>.
+<P>
+The author of this port is <a href="mailto:csomor@advancedconcepts.ch">Stefan Csomor</a>.
 <P>
 
 <h3><a name="macplat">Which Mac platforms are supported?</a></h3>
@@ -213,6 +206,31 @@ Because wxWindows does not have a specific API for the <i>About</i> menu item or
 </ul>
 <P>
 
+<h3><a name="findericon">How do I add an icon to my application?</a></h3>
+
+If you have Mac OS X, you have the icns editor somewhere in the
+Utilities folder. Create an icon using this tool and DeRez it, so that you have a .r
+file with a 'icns' resource with id (-16455). Include this .r file in
+your project and in the CodeWarrior Settings add a check mark under Linker:Output
+Flags/Finder Flags/Has Custom Icon.
+<P>
+
+<h3><a name="switching">How can I easily switch between different versions of wxWindows in CodeWarrior?</a></h3>
+
+Sometimes you want to test your application against different versions
+of wxWindows, for example a stable version of wxWindows versus a development version.
+The easiest way to do this is to create a symbolic path.<P>
+
+Under Edit-Preferences in General:Source Trees, type a name (for example WXWIN)
+and choose a path for it. Now reselect your include and lib paths for a last
+time, in the settings for each configuration, but make them relative to the symbolic name.
+<P>
+
+From now on you can just change the path associated with the symbolic name.
+
+<P>
+
+
 </font>
 
 </BODY>