X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2d48b36a65f1f9adda42027cc02d7ace47890dc..b8be6ceacfa3ffb8304559d28e759c7b5613ec15:/docs/html/faqmsw.htm?ds=sidebyside

diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm
index 7cf90ae7ec..cfe6e89be3 100644
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -35,6 +35,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#dll">Can you compile wxWindows 2 as a DLL?</a></li>
 <li><a href="#exesize">How can I reduce executable size?</a></li>
 <li><a href="#mfc">Is wxWindows compatible with MFC?</a></li>
+<li><a href="#setuph">Why do I get errors about setup.h not being found?</a></li>
 <li><a href="#asuffix">Why do I get errors about FooBarA when I only use FooBar in my program?</a></li>
 <li><a href="#newerrors">Why my code fails to compile with strange errors about new operator?</a></li>
 <li><a href="#mfcport">How do I port MFC applications to wxWindows?</a></li>
@@ -63,14 +64,13 @@ makefiles to see what other files have been left out.
 16-bit compilation is supported under Visual C++ 1.5, and Borland BC++ 4 to 5.
 <P>
 
-wxWindows 2 for Windows will also compile on Unix with gcc using TWIN32 from <a href="http://www.willows.com" target=_top>Willows</a>,
-although TWIN32 is still in a preliminary state. The resulting executables are
-Unix binaries that work with the TWIN32 Windows API emulator.<P>
+wxWindows 2 for Windows will also compile on Unix with gcc using Wine from <a href="http://www.winehq.org" target=_top>WineHQ</a>.
+The resulting executables are Unix binaries that work with the Wine Windows API emulator.<P>
 
 You can also compile wxWindows 2 for Windows on Unix with Cygwin or Mingw32, resulting
 in executables that will run on Windows. So in theory you could write your applications
 using wxGTK or wxMotif, then check/debug your wxWindows for Windows
-programs with TWIN32, and finally produce an ix86 Windows executable using Cygwin/Mingw32,
+programs with Wine, and finally produce an ix86 Windows executable using Cygwin/Mingw32,
 without ever needing a copy of Microsoft Windows. See the Technical Note on the Web site detailing cross-compilation.<P>
 
 <h3><a name="wince">What about Windows CE?</a></h3>
@@ -243,6 +243,21 @@ There is a sample which demonstrates MFC and wxWindows code co-existing in the s
 application. However, don&#39;t expect to be able to enable wxWindows windows with OLE-2
 functionality using MFC.<P>
 
+<H3><a name="setuph">Why do I get errors about setup.h not being found?</a></H3>
+
+When you build the wxWindows library, setup.h is copied
+from include/wx/msw/setup.h to e.g. lib/mswd/wx/setup.h (the path
+depends on the configuration you're building). So you need to add
+this include path if building using the static Debug library:<P>
+
+lib/mswd<P>
+
+or if building the static Release library, lib/msw.<P>
+
+See also the <a href="http://wiki.wxwindows.org/wiki.pl?Table_Of_Contents">wxWiki Contents</a>
+for more information.<P>
+
+
 <H3><a name="asuffix">Why do I get errors about FooBarA when I only use FooBar in my program?</H3>
 
 If you get errors like
@@ -281,7 +296,8 @@ the <a href="#vcdebug">VC++ CRT memory debugging features</a> instead.
 
 <H3><a name="mfcport">How do I port MFC applications to wxWindows?</a></H3>
 
-Set up your interface from scratch using wxWindows (especially wxDesigner --
+Set up your interface from scratch using wxWindows (especially <a href="http://www.robeling.de" target=_top>wxDesigner</a>
+or <a href="http://www.anthemion.co.uk/dialogblocks/" target=_new>DialogBlocks</a> --
 it&#39;ll save you a <i>lot</i> of time) and when you have a shell prepared, you can start
 &#39;pouring in&#39; code from the MFC app, with appropriate
 modifications. This is the approach I have used, and I found