X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2edb0bdef6238c8c246b6978bc14828b7033d931..2e18fe7139558b3cb592a04a4e4668319a966ebf:/docs/msw/winxp.txt

diff --git a/docs/msw/winxp.txt b/docs/msw/winxp.txt
index 021405a5bd..6c03f97760 100644
--- a/docs/msw/winxp.txt
+++ b/docs/msw/winxp.txt
@@ -1,24 +1,31 @@
-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. Notice that MSVC 2005 and later embed manifest in the
+executables it produces and wxWidgets doesn't use its own manifest when using
+this compiler. And if you don't want to use wxWidgets manifest with another
+compiler you may define wxUSE_NO_MANIFEST as 1 prior to including wx/msw/wx.rc.
 
-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
 
-http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwxp/html/xptheming.asp
+Finally, if all else fails you may always use a manifest manually. For this you
+need to create your own manifest file and put it in a file called
+"yourapp.exe.manifest" 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
 
-for more details.
+http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175
 
+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 +39,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
@@ -47,16 +54,3 @@ file to test theme support using the controls sample:
 </dependency>
 </assembly>
 --- cut here ---
-
-
-There are a few minor problems with theme support in wxWindows currently
-which will be fixed in the next releases:
-
-- the buttons with non-default colours are owner-drawn and thus don't
-  follow the visual style look but always have the default 3D look of
-  the previous Windows versions - don't change the buttons colours if
-  you want them to look nicely under Windows XP
-
-- wxCheckListBox control doesn't have the same appearance as the native
-  checkboxes in Windows XP
-