X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91773b3f0d671fe3fac599db482dd71cb8f18f9c..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/msw/wx.rc?ds=sidebyside diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 78858b5638..619a188d6f 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -30,44 +30,14 @@ ///////////////////////////////////////////////////////////////////////////// #if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__) - #include + #include "wx/msw/gnuwin32/winresrc.h" #else - #include + #include #endif -////////////////////////////////////////////////////////////////////////////// -// -// Dummy Dialog for all wxCAPTION Dialog boxes -// - -wxResizeableDialog DIALOG DISCARDABLE 34, 22, 144, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME -CAPTION "" -BEGIN -#ifdef __WATCOMC__ - LTEXT "", -1,-2,-2,1,1 +#if defined(_WIN32_WCE) + #include "wx/msw/wince/wince.rc" #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 ////////////////////////////////////////////////////////////////////////////// // @@ -97,7 +67,6 @@ WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur" WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur" WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur" WXCURSOR_NO_ENTRY CURSOR DISCARDABLE "wx/msw/noentry.cur" -WXCURSOR_SIZING CURSOR DISCARDABLE "wx/msw/size.cur" WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur" WXCURSOR_WATCH CURSOR DISCARDABLE "wx/msw/watch1.cur" WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur" @@ -105,6 +74,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,13 +86,6 @@ WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur" //wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico" //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" - // Standard small icons wxICON_SMALL_CLOSED_FOLDER ICON "wx/msw/folder1.ico" wxICON_SMALL_OPEN_FOLDER ICON "wx/msw/folder2.ico" @@ -137,24 +101,20 @@ 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 obtaining the RGB values of standard colours +wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" -// For src/generic/proplist.cpp -tick_bmp BITMAP "wx/msw/tick.bmp" -cross_bmp BITMAP "wx/msw/cross.bmp" +////////////////////////////////////////////////////////////////////////////// +// +// Manifest file for Windows XP +// -// 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" +#if !defined(__WIN64__) +#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) +1 24 "wx/msw/wx.manifest" +#endif +#endif -// For wxContextHelpButton -csquery BITMAP "wx/msw/csquery.bmp"