wxClipboard changes compilation fixes

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index e99ea3d244b53c388943400b94de97fdeb3babce..c558138d6091c0362b4c7b3ab9f740030a91b74c 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -30,9 +30,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
-       #include <wx/msw/gnuwin32/winresrc.h>
+    #include <wx/msw/gnuwin32/winresrc.h>
 #else
-       #include <windows.h>
+    #include <windows.h>
+#endif
+
+#if defined(_WIN32_WCE)
+    #include "wx\msw\wince\wince.rc"
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -105,3 +109,14 @@ csquery                 BITMAP "wx/msw/csquery.bmp"
 // For obtaining the RGB values of standard colours
 wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 
+//////////////////////////////////////////////////////////////////////////////
+//
+// Manifest file for Windows XP
+//
+
+#if !defined(__WIN64__)
+#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
+1 24 "wx/msw/wx.manifest"
+#endif
+#endif
+