Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 78858b5638700273265f96d60f0f3d84c7b888f7..2a9681b78c530d33c325499b85d1d8052af540db 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -116,11 +116,13 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 //wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
 // Standard large icons
-wxICON_QUESTION                        ICON "wx/msw/question.ico"
-wxICON_WARNING                 ICON "wx/msw/warning.ico"
-wxICON_ERROR                   ICON "wx/msw/error.ico"
-wxICON_INFO                    ICON "wx/msw/info.ico"
-wxICON_TIP                     ICON "wx/msw/tip.ico"
+/* we don't use these files any more, use Windows standard icons instead
+wxICON_QUESTION        ICON "wx/msw/question.ico"
+wxICON_WARNING ICON "wx/msw/warning.ico"
+wxICON_ERROR   ICON "wx/msw/error.ico"
+wxICON_INFO            ICON "wx/msw/info.ico"
+*/
+wxICON_TIP             ICON "wx/msw/tip.ico"
 
 // Standard small icons
 wxICON_SMALL_CLOSED_FOLDER      ICON "wx/msw/folder1.ico"
@@ -148,13 +150,9 @@ wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
 tick_bmp                BITMAP  "wx/msw/tick.bmp"
 cross_bmp               BITMAP  "wx/msw/cross.bmp"
 
-// For src/generic/plot.cpp
-plot_up_bmp             BITMAP  "wx/msw/plot_up.bmp"
-plot_dwn_bmp            BITMAP  "wx/msw/plot_dwn.bmp"
-plot_enl_bmp            BITMAP  "wx/msw/plot_enl.bmp"
-plot_shr_bmp            BITMAP  "wx/msw/plot_shr.bmp"
-plot_zin_bmp            BITMAP  "wx/msw/plot_zin.bmp"
-plot_zot_bmp            BITMAP  "wx/msw/plot_zot.bmp"
-
 // For wxContextHelpButton
 csquery                 BITMAP "wx/msw/csquery.bmp"
+
+// For obtaining the RGB values of standard colours
+wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
+