// 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(__MWERKS__)
-#include <wx/msw/gnuwin32/winresrc.h>
+#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
+ #include <wx/msw/gnuwin32/winresrc.h>
#else
-#include <windows.h>
+ #include <windows.h>
#endif
-//////////////////////////////////////////////////////////////////////////////
-//
-// Dummy Dialog for all wxCAPTION Dialog boxes
-//
-
-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
-
//////////////////////////////////////////////////////////////////////////////
//
// This is the MDI Window menu
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
// 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_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur"
WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur"
WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur"
-#endif
//////////////////////////////////////////////////////////////////////////////
//
//wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico"
//wxDEFAULT_MDICHILDFRAME ICON "wx/msw/child.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
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"
+