Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).

[wxWidgets.git] / samples / toolbar / toolbar.rc

diff --git a/samples/toolbar/toolbar.rc b/samples/toolbar/toolbar.rc
index 6c9086d0c6f64fe9122c311126b661bd75a1bfe0..3a4920cf6cf3269d1a021fe1f3fdfb9d6c50a46c 100644 (file)
--- a/samples/toolbar/toolbar.rc
+++ b/samples/toolbar/toolbar.rc
@@ -1,13 +1,11 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
+#include "../sample.rc"
 
-icon1 BITMAP "bitmaps/new.bmp"
-icon2 BITMAP "bitmaps/open.bmp"
-icon3 BITMAP "bitmaps/save.bmp"
-icon4 BITMAP "bitmaps/copy.bmp"
-icon5 BITMAP "bitmaps/cut.bmp"
-icon6 BITMAP "bitmaps/paste.bmp"
-icon7 BITMAP "bitmaps/print.bmp"
-
-icon8 BITMAP "bitmaps/help.bmp"
+new BITMAP "bitmaps/new.bmp"
+open BITMAP "bitmaps/open.bmp"
+save BITMAP "bitmaps/save.bmp"
+copy BITMAP "bitmaps/copy.bmp"
+cut BITMAP "bitmaps/cut.bmp"
+paste BITMAP "bitmaps/paste.bmp"
+print BITMAP "bitmaps/print.bmp"
+help BITMAP "bitmaps/help.bmp"