Correction in comment in closing #endif.

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index e9371c812af02dd9f1d5d15e93497fc8e871260a..62c850d6b1b92ac8a31c9577d9dcf1194fdee43a 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
 
 //////////////////////////////////////////////////////////////////////////////
@@ -71,6 +75,7 @@ WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
 WXCURSOR_QARROW         CURSOR  DISCARDABLE     "wx/msw/query.cur"
 WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 WXCURSOR_RIGHT_ARROW    CURSOR  DISCARDABLE     "wx/msw/rightarr.cur"
+WXCURSOR_CROSS          CURSOR  DISCARDABLE     "wx/msw/cross.cur"
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -97,8 +102,6 @@ wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
 // Bitmaps
 //
 
-wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
-
 // For wxContextHelpButton
 csquery                 BITMAP "wx/msw/csquery.bmp"
 
@@ -110,7 +113,9 @@ 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