another wxUSE_DRAG_AND_DROP==0 compilation fix

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

diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc
index 30e40e5ad313829a2e2f12145efd9d9ad7f727be..1a8570756a53cd6d2ee6f093e549b9e4a48ceb01 100644 (file)
--- a/include/wx/os2/wx.rc
+++ b/include/wx/os2/wx.rc
@@ -1,101 +1,85 @@
-/////////////////////////////////////////////////////////////////////////////
-// File:     wx.rc
-// Purpose:  wxWindows resource definitions. ALWAYS include
-//           this in your application resource file.
-//
-//                     wxWindows version 2.1.11
-//
-//                     Author: David Webster
-//                       Date: 11-21-99
-//
-// 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$
-/////////////////////////////////////////////////////////////////////////////
-

 #include <os2.h>
 #include <os2.h>

+#include "wxrsc.h"

 
 

-//////////////////////////////////////////////////////////////////////////////
-//
-// Dummy Dialog for all wxCAPTION Dialog boxes
-//

 
 

+/*

 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

-//

 // This is the MDI Window menu
 // This is the MDI Window menu

-//
-
-wxWindowMenu MENU DISCARDABLE
+//////////////////////////////////////////////////////////////////////////////
+*/
+MENU    ID_WINDOW_MENU  PRELOAD

 BEGIN
 BEGIN

-    SUBMENU "&Window"
+    SUBMENU "~Window",   131

     BEGIN
     BEGIN

-        MENUITEM "&Cascade",                    4002
-        MENUITEM "Tile &Horizontally",          4001
-        MENUITEM "Tile &Vertically",            4005
-        MENUITEM "",             0,             MIS_SEPARATOR
-        MENUITEM "&Arrange Icons",              4003
-        MENUITEM "&Next",                       4004
+        MENUITEM "~Cascade",                    132
+        MENUITEM "Tile ~Horizontally",          133
+        MENUITEM "Tile ~Vertically",            134
+        MENUITEM "",                              -1
+        MENUITEM "~Arrange Icons",              135
+        MENUITEM "~Next",                       136

     END
 END
 
     END
 END
 

+/*
+//////////////////////////////////////////////////////////////////////////////
+// Standard winWindows Cursors

 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

-//
-// Standard wxWindows Cursors
-//
+*/

 
 

-POINTER    WXCURSOR_HAND           LOADONCALL     "wx/os2/hand.ptr"
-POINTER    WXCURSOR_BULLSEYE       LOADONCALL     "wx/os2/bullseye.ptr"
-POINTER    WXCURSOR_PENCIL         LOADONCALL     "wx/os2/pencil.ptr"
-POINTER    WXCURSOR_MAGNIFIER      LOADONCALL     "wx/os2/magnif1.ptr"
-POINTER    WXCURSOR_NO_ENTRY       LOADONCALL     "wx/os2/noentry.ptr"
-POINTER    WXCURSOR_SIZING         LOADONCALL     "wx/os2/size.ptr"
-POINTER    WXCURSOR_ROLLER         LOADONCALL     "wx/os2/roller.ptr"
-POINTER    WXCURSOR_WATCH          LOADONCALL     "wx/os2/watch1.ptr"
-POINTER    WXCURSOR_PBRUSH         LOADONCALL     "wx/os2/pbrush.ptr"
-POINTER    WXCURSOR_PLEFT          LOADONCALL     "wx/os2/pntleft.ptr"
-POINTER    WXCURSOR_PRIGHT         LOADONCALL     "wx/os2/pntright.ptr"
-POINTER    WXCURSOR_QARROW         LOADONCALL     "wx/os2/query.ptr"
-POINTER    WXCURSOR_BLANK          LOADONCALL     "wx/os2/blank.ptr"
+POINTER    WXCURSOR_HAND           LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\hand.ptr"
+POINTER    WXCURSOR_BULLSEYE       LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\bullseye.ptr"
+POINTER    WXCURSOR_PENCIL         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pencil.ptr"
+POINTER    WXCURSOR_MAGNIFIER      LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\magnit1.ptr"
+POINTER    WXCURSOR_SIZING         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\size.ptr"
+POINTER    WXCURSOR_ROLLER         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\roller.ptr"
+POINTER    WXCURSOR_PBRUSH         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pbrush.ptr"
+POINTER    WXCURSOR_PLEFT          LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntleft.ptr"
+POINTER    WXCURSOR_PRIGHT         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntright.ptr"
+POINTER    WXCURSOR_QARROW         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\query.ptr"
+POINTER    WXCURSOR_BLANK          LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\blank.ptr"

 
 

+/*

 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

-//

 // Default Icons
 // Default Icons

-//
-
-//ICON     wxDEFAULT_FRAME            PRELOAD "wx/os2/std.ico"
-//ICON     wxDEFAULT_MDIPARENTFRAME   PRELOAD "wx/os2/mdi.ico"
-//ICON     wxDEFAULT_MDICHILDFRAME    PRELOAD "wx/os2/child.ico"
+//////////////////////////////////////////////////////////////////////////////
+*/
+/* Standard icons */
+ICON       wxICON_TIP                    PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\tip.ico"

 
 

-// Standard icons
-ICON       wxICON_QUESTION  PRELOAD "wx/os2/question.ico"
-ICON       wxICON_WARNING   PRELOAD "wx/os2/warning.ico"
-ICON       wxICON_ERROR     PRELOAD "wx/os2/error.ico"
-ICON       wxICON_INFO      PRELOAD "wx/os2/info.ico"
-ICON       wxICON_TIP       PRELOAD "wx/os2/tip.ico"
+ICON       wxICON_SMALL_CLOSED_FOLDER    PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\folder1.ico"
+ICON       wxICON_SMALL_OPEN_FOLDER      PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\folder2.ico"
+ICON       wxICON_SMALL_FILE             PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\file.ico"
+ICON       wxICON_SMALL_COMPUTER         PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\computer.ico"
+ICON       wxICON_SMALL_DRIVE            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\drive.ico"
+ICON       wxICON_SMALL_CDROM            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\cdrom.ico"
+ICON       wxICON_SMALL_FLOPPY           PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\floppy.ico"
+ICON       wxICON_SMALL_REMOVEABLE       PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\removble.ico"
+ICON       wxICON_SMALL_ERROR            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\error.ico"
+ICON       wxICON_SMALL_INFO             PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\info.ico"
+ICON       wxICON_SMALL_WARNING          PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\warning.ico"

 
 

+/*

 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

-//

 // Bitmaps
 // Bitmaps

-//
+//////////////////////////////////////////////////////////////////////////////
+*/
+BITMAP     wxDISABLE_BUTTON_BITMAP   LOADONCALL   "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\disable.bmp"

 
 

-BITMAP     wxDISABLE_BUTTON_BITMAP   LOADONCALL  "wx/os2/disable.bmp"
+/*
+// For src/generic/proplist.cpp
+*/
+BITMAP     wxTICK_BITMAP              LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\tick.bmp"
+BITMAP     wxCROSS_BITMAP             LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\cross.bmp"

 
 

+/*
+// For kContextHelpButton
+*/
+BITMAP     wxCSQUERY_BITMAP           LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\csquery.bmp"

 
 

-// For src/generic/proplist.cpp
-BITMAP     tick_bmp                  LOADONCALL  "wx/os2/tick.bmp"
-BITMAP     cross_bmp                 LOADONCALL  "wx/os2/cross.bmp"
+/*
+// For obtaining the RGB values of standard colours
+*/
+BITMAP     wxBITMAP_STD_COLOURS       LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\colours.bmp"
+
+RCINCLUDE \Dev\Wx2\WxWindows\INCLUDE\WX\OS2\WX.DLG