X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51a58d8b4bb58b66ec84dc94c56fe328d77c904a..edb89f7e356761b4fbdaebb8b5ebd5c7a7643da7:/include/wx/msw/wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 2787d3b645..2a9681b78c 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -41,7 +41,7 @@
 //
 
 wxResizeableDialog DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME
 CAPTION ""
 BEGIN
 #ifdef __WATCOMC__
@@ -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,10 +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"
+