Remove instruction to define NO_GCC_PRAGMA when compiling with gcc using Makefiles...

[wxWidgets.git] / docs / msw / winxp.txt

diff --git a/docs/msw/winxp.txt b/docs/msw/winxp.txt
index 6074f13b8a8c60dae96257db655ce4abb8564af7..e17a55772f88b708a88ee4a66480045704d4fbbe 100644 (file)
--- a/docs/msw/winxp.txt
+++ b/docs/msw/winxp.txt
@@ -1,16 +1,19 @@
-Microsoft Windows XP Support in wxWindows 2.3.2
------------------------------------------------
+Microsoft Windows XP Support from wxWidgets
+-------------------------------------------
 
 Windows XP introduces the themes (called "visual styles" in the Microsoft
-documentation) in Windows world. As wxWindows uses the standard Windows
+documentation) in Windows world. As wxWidgets uses the standard Windows
 controls for most of its classes, it can take advantage of it without
 (almost) any effort from your part. The only thing you need to do if you
 want your program to honour the visual style setting of Windows XP is to
 add the manifest file to your program (this is not at all specific to
-wxWindows programs but is required for all Windows applications).
+wxWidgets programs but is required for all Windows applications).
 
+wxWidgets now includes manifest resources in wx.rc, so it should be enough to
+include "wx/msw/wx.rc" in your application's resource file and you get
+XP look automatically. If it doesn't work, follow the instructions below:
 
-For your convinience, below is an example manifest. It should be put in a
+For your convenience, below is an example manifest. It should be put in a
 file called "yourapp.exe.manifest" and put in the same directory where
 "yourapp.exe" resides. Alternatively, you can include the manifest in your
 applications resource section. Please see the MSDN documentation at
@@ -19,7 +22,6 @@ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwxp/html/xpth
 
 for more details.
 
-
 Here is the example manifest which you can put into controls.exe.manifest
 file to test theme support using the controls sample:
 
@@ -32,7 +34,7 @@ file to test theme support using the controls sample:
     name="Controls"
     type="win32"
 />
-<description>Controls: wxWindows sample application</description>
+<description>Controls: wxWidgets sample application</description>
 <dependency>
     <dependentAssembly>
         <assemblyIdentity
@@ -49,7 +51,7 @@ file to test theme support using the controls sample:
 --- cut here ---
 
 
-There are a few minor problems with theme support in wxWindows currently
+There are a few minor problems with theme support in wxWidgets currently
 which will be fixed in the next releases:
 
 - the buttons with non-default colours are owner-drawn and thus don't