/////////////////////////////////////////////////////////////////////////////
-// File: wx.rc
-// Purpose: wxWindows resource definitions. ALWAYS include
-// this in your application resource file.
-//
-// wxWindows version 1.50
-// Copyright (c) 1993 Artificial Intelligence Applications Institute,
-// The University of Edinburgh
-//
-// Author: Julian Smart
-// Date: 9-4-93
-//
-// Permission to use, copy, modify, and distribute this software and its
-// documentation for any purpose is hereby granted without fee, provided
-// that the above copyright notice, author statement and this permission
-// notice appear in all copies of this software and related documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS,
-// IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
-// MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-//
-// IN NO EVENT SHALL THE ARTIFICIAL INTELLIGENCE APPLICATIONS INSTITUTE OR THE
-// UNIVERSITY OF EDINBURGH BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR
-// CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// 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$
+// File: wx.rc
+// Purpose: wxWindows resource definitions. ALWAYS include
+// this in your application resource file.
+// Author: Julian Smart
+// Modified by:
+// Created:
+// Copyright: (c) Julian Smart
+// RCS-ID: $Id$
+// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
-#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
- #include <wx/msw/gnuwin32/winresrc.h>
+#if defined(__MWERKS__)
+#include <winresrc.h>
#else
- #include <windows.h>
+#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
+#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
+#include "wx/msw/rcdefs.h"
//////////////////////////////////////////////////////////////////////////////
//
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"
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"
+WXCURSOR_CROSS CURSOR DISCARDABLE "wx/msw/cross.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"
+
+// Low alphabetically to make it the default, but not so low as to
+// affect applications that use 'a'
+bICON ICON "wx/msw/std.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
+//
+
+#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
+#if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+
+#if defined(WX_CPU_AMD64)
+1 24 "wx/msw/amd64.manifest"
+#elif defined(WX_CPU_IA64)
+1 24 "wx/msw/ia64.manifest"
+#elif defined(WX_CPU_X86)
+1 24 "wx/msw/wx.manifest"
+#endif
-// 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"
+#endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+#endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
projects / wxWidgets.git / blobdiff