X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/462e243784a59bea163c43db02749a556b552234..edea62818b7808c11e2c536b52941809f338f2fb:/include/wx/msw/wx.rc diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 3c0f4e3478..619a188d6f 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -25,43 +25,19 @@ // LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF // DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH // THE USE OR PERFORMANCE OF THIS SOFTWARE. -///////////////////////////////////////////////////////////////////////////// -// // +// Version: $Id$ +///////////////////////////////////////////////////////////////////////////// #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_SYSMENU | WS_THICKFRAME -CAPTION "" -BEGIN - LTEXT "", -1,-2,-2,1,1 //necessary for __WATCOMC__ -END - -wxCaptionDialog DIALOG DISCARDABLE 34, 22, 144, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Dummy dialog" -BEGIN - LTEXT "", -1,-2,-2,1,1 //necessary for __WATCOMC__ -END - -// -// Dummy dialog for dialog boxes without caption & with thin frame -// -wxNoCaptionDialog DIALOG 34, 22, 144, 75 -STYLE WS_POPUP -BEGIN - LTEXT "", -1,-2,-2,1,1 //necessary for __WATCOMC__ -END +#if defined(_WIN32_WCE) + #include "wx/msw/wince/wince.rc" +#endif ////////////////////////////////////////////////////////////////////////////// // @@ -73,7 +49,9 @@ BEGIN POPUP "&Window" BEGIN MENUITEM "&Cascade", 4002 - MENUITEM "&Tile", 4001 + MENUITEM "Tile &Horizontally", 4001 + MENUITEM "Tile &Vertically", 4005 + MENUITEM "", -1 MENUITEM "&Arrange Icons", 4003 MENUITEM "&Next", 4004 END @@ -84,27 +62,11 @@ END // Standard wxWindows Cursors // -#ifdef __SALFORDC__ -WXCURSOR_HAND CURSOR DISCARDABLE WXINCDIR"wx/msw/hand.cur" -WXCURSOR_BULLSEYE CURSOR DISCARDABLE WXINCDIR"wx/msw/bullseye.cur" -WXCURSOR_PENCIL CURSOR DISCARDABLE WXINCDIR"wx/msw/pencil.cur" -WXCURSOR_MAGNIFIER CURSOR DISCARDABLE WXINCDIR"wx/msw/magnif1.cur" -WXCURSOR_NO_ENTRY CURSOR DISCARDABLE WXINCDIR"wx/msw/noentry.cur" -WXCURSOR_SIZING CURSOR DISCARDABLE WXINCDIR"wx/msw/size.cur" -WXCURSOR_ROLLER CURSOR DISCARDABLE WXINCDIR"wx/msw/roller.cur" -WXCURSOR_WATCH CURSOR DISCARDABLE WXINCDIR"wx/msw/watch1.cur" -WXCURSOR_PBRUSH CURSOR DISCARDABLE WXINCDIR"wx/msw/pbrush.cur" -WXCURSOR_PLEFT CURSOR DISCARDABLE WXINCDIR"wx/msw/pntleft.cur" -WXCURSOR_PRIGHT CURSOR DISCARDABLE WXINCDIR"wx/msw/pntright.cur" -WXCURSOR_QARROW CURSOR DISCARDABLE WXINCDIR"wx/msw/query.cur" -WXCURSOR_BLANK CURSOR DISCARDABLE WXINCDIR"wx/msw/blank.cur" -#else WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur" 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" @@ -112,7 +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" -#endif +WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur" + ////////////////////////////////////////////////////////////////////////////// // @@ -123,14 +86,35 @@ WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur" //wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico" //wxDEFAULT_MDICHILDFRAME ICON "wx/msw/child.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" +// For wxContextHelpButton +csquery BITMAP "wx/msw/csquery.bmp" + +// For obtaining the RGB values of standard colours +wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" + +////////////////////////////////////////////////////////////////////////////// +// +// Manifest file for Windows XP +// + +#if !defined(__WIN64__) +#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) +1 24 "wx/msw/wx.manifest" +#endif #endif