changed make_int, make_exp .. to wxmake_int..

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index a3877551d71891d7fa7d62b913ecd5f826ac5b65..a8eed6817b02594e05801584208d932e2d7d3c2e 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -29,7 +29,7 @@
 //
 //
 
-#ifdef __GNUWIN32__
+#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
 #include <wx/msw/gnuwin32/winresrc.h>
 #else
 #include <windows.h>
@@ -77,6 +77,21 @@ END
 // Standard wxWindows Cursors
 //
 
+#ifdef __SALFORDC__
+WXCURSOR_HAND           CURSOR  DISCARDABLE     WXINCDIR"wx/msw/hand.cur"
+WXCURSOR_BULLSEYE       CURSOR  DISCARDABLE     WXINCDIR"wx/msw/bullseye.cur"
+WXCURSOR_PENCIL         CURSOR  DISCARDABLE     WXINCDIR"wx/msw/pencil.cur"
+WXCURSOR_MAGNIFIER      CURSOR  DISCARDABLE     WXINCDIR"wx/msw/magnif1.cur"
+WXCURSOR_NO_ENTRY       CURSOR  DISCARDABLE     WXINCDIR"wx/msw/noentry.cur"
+WXCURSOR_SIZING         CURSOR  DISCARDABLE     WXINCDIR"wx/msw/size.cur"
+WXCURSOR_ROLLER         CURSOR  DISCARDABLE     WXINCDIR"wx/msw/roller.cur"
+WXCURSOR_WATCH          CURSOR  DISCARDABLE     WXINCDIR"wx/msw/watch1.cur"
+WXCURSOR_PBRUSH         CURSOR  DISCARDABLE     WXINCDIR"wx/msw/pbrush.cur"
+WXCURSOR_PLEFT          CURSOR  DISCARDABLE     WXINCDIR"wx/msw/pntleft.cur"
+WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     WXINCDIR"wx/msw/pntright.cur"
+WXCURSOR_QARROW         CURSOR  DISCARDABLE     WXINCDIR"wx/msw/query.cur"
+WXCURSOR_BLANK          CURSOR  DISCARDABLE     WXINCDIR"wx/msw/blank.cur"
+#else
 WXCURSOR_HAND           CURSOR  DISCARDABLE     "wx/msw/hand.cur"
 WXCURSOR_BULLSEYE       CURSOR  DISCARDABLE     "wx/msw/bullseye.cur"
 WXCURSOR_PENCIL         CURSOR  DISCARDABLE     "wx/msw/pencil.cur"
@@ -90,21 +105,25 @@ WXCURSOR_PLEFT          CURSOR  DISCARDABLE     "wx/msw/pntleft.cur"
 WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
 WXCURSOR_QARROW         CURSOR  DISCARDABLE     "wx/msw/query.cur"
 WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
+#endif
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Default Icons
 //
 
-wxDEFAULT_FRAME               ICON "wx/msw/std.ico"
-wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
-wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
+//wxDEFAULT_FRAME               ICON "wx/msw/std.ico"
+//wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
+//wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps
 //
 
+#ifdef __SALFORDC__
+wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
+#else
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
-
+#endif