use MSWCreateControl() instead of duplicating its code

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index f3da9b212cd08a87e8025e5d7c12b4e8542b46dd..da439acd9bf38d8b5f02093c9ec8a4fec6a75e15 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -35,40 +35,6 @@
        #include <windows.h>
 #endif
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// Dummy Dialog for all wxCAPTION Dialog boxes
-//
-
-wxResizeableDialog DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-CAPTION ""
-BEGIN
-#ifdef __WATCOMC__
-       LTEXT "", -1,-2,-2,1,1
-#endif
-END
-
-wxCaptionDialog DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU
-CAPTION "Dummy dialog"
-BEGIN
-#ifdef __WATCOMC__
-       LTEXT "", -1,-2,-2,1,1
-#endif
-END
-
-//
-// Dummy dialog for dialog boxes without caption & with thin frame
-//
-wxNoCaptionDialog DIALOG 34, 22, 144, 75
-STYLE WS_POPUP
-BEGIN
-#ifdef __WATCOMC__
-       LTEXT "", -1,-2,-2,1,1
-#endif
-END
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // This is the MDI Window menu
@@ -105,6 +71,8 @@ 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"
+WXCURSOR_RIGHT_ARROW    CURSOR  DISCARDABLE     "wx/msw/rightarr.cur"
+
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -115,33 +83,26 @@ 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"
-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
 //
 
-#ifdef __SALFORDC__
-wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
-#else
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
-#endif
 
+// For wxContextHelpButton
+csquery                 BITMAP "wx/msw/csquery.bmp"
 
-// For src/generic/proplist.cpp
-tick_bmp                BITMAP  "wx/msw/tick.bmp"
-cross_bmp               BITMAP  "wx/msw/cross.bmp"
+// For obtaining the RGB values of standard colours
+wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.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"