A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 1ca1d48c6d123ddf95297c730fb51c5f08695ed9..2a9681b78c530d33c325499b85d1d8052af540db 100644 (file)
--- 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__
@@ -115,13 +115,25 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 //wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
 //wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
-// Standard icons
-wxICON_QUESTION                ICON "wx/msw/question.ico"
-wxICON_WARNING         ICON "wx/msw/warning.ico"
-wxICON_ERROR           ICON "wx/msw/error.ico"
+// Standard large icons
+/* 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"
+wxICON_SMALL_OPEN_FOLDER        ICON "wx/msw/folder2.ico"
+wxICON_SMALL_FILE               ICON "wx/msw/file1.ico"
+wxICON_SMALL_COMPUTER           ICON "wx/msw/computer.ico"
+wxICON_SMALL_DRIVE              ICON "wx/msw/drive.ico"
+wxICON_SMALL_CDROM              ICON "wx/msw/cdrom.ico"
+wxICON_SMALL_FLOPPY             ICON "wx/msw/floppy.ico"
+wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps
@@ -133,3 +145,14 @@ wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
 #endif
 
+
+// For src/generic/proplist.cpp
+tick_bmp                BITMAP  "wx/msw/tick.bmp"
+cross_bmp               BITMAP  "wx/msw/cross.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"
+