diff --git a/include/wx/os2/cdrom.ico b/include/wx/os2/cdrom.ico new file mode 100644 index 0000000000..e9e2364af1 Binary files /dev/null and b/include/wx/os2/cdrom.ico differ diff --git a/include/wx/os2/colours.bmp b/include/wx/os2/colours.bmp new file mode 100644 index 0000000000..62d1f8045f Binary files /dev/null and b/include/wx/os2/colours.bmp differ diff --git a/include/wx/os2/computer.ico b/include/wx/os2/computer.ico new file mode 100644 index 0000000000..07d8e0e29a Binary files /dev/null and b/include/wx/os2/computer.ico differ diff --git a/include/wx/os2/csquery.bmp b/include/wx/os2/csquery.bmp new file mode 100644 index 0000000000..7a63555268 Binary files /dev/null and b/include/wx/os2/csquery.bmp differ diff --git a/include/wx/os2/drive.ico b/include/wx/os2/drive.ico new file mode 100644 index 0000000000..06ed593368 Binary files /dev/null and b/include/wx/os2/drive.ico differ diff --git a/include/wx/os2/file.ico b/include/wx/os2/file.ico new file mode 100644 index 0000000000..a0769fac51 Binary files /dev/null and b/include/wx/os2/file.ico differ diff --git a/include/wx/os2/floppy.ico b/include/wx/os2/floppy.ico new file mode 100644 index 0000000000..823094f1e5 Binary files /dev/null and b/include/wx/os2/floppy.ico differ diff --git a/include/wx/os2/folder1.ico b/include/wx/os2/folder1.ico new file mode 100644 index 0000000000..317fe37393 Binary files /dev/null and b/include/wx/os2/folder1.ico differ diff --git a/include/wx/os2/folder2.ico b/include/wx/os2/folder2.ico new file mode 100644 index 0000000000..b35a1469ec Binary files /dev/null and b/include/wx/os2/folder2.ico differ diff --git a/include/wx/os2/removble.ico b/include/wx/os2/removble.ico new file mode 100644 index 0000000000..823094f1e5 Binary files /dev/null and b/include/wx/os2/removble.ico differ diff --git a/include/wx/os2/watch.ptr b/include/wx/os2/watch.ptr new file mode 100644 index 0000000000..d974fab543 Binary files /dev/null and b/include/wx/os2/watch.ptr differ diff --git a/include/wx/os2/wx.dlg b/include/wx/os2/wx.dlg new file mode 100644 index 0000000000..8cfb267c77 --- /dev/null +++ b/include/wx/os2/wx.dlg @@ -0,0 +1,34 @@ +DLGINCLUDE 1 \\dev\\wx2\\wxwindows\\include\\wx\\os2\\wxrsc.h + +DLGTEMPLATE ID_RESIZEABLEDIALOG PRELOAD MOVEABLE DISCARDABLE +BEGIN + DIALOG "" ID_RESIZEABLEDIALOG 34, 22, 144, 75 + WS_SAVEBITS | FS_SIZEBORDER | FS_NOMOVEWITHOWNER, + FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU + BEGIN + END +END + +DLGTEMPLATE ID_CAPTIONDIALOG PRELOAD MOVEABLE DISCARDABLE +BEGIN + DIALOG "Dummy Dialog" ID_CAPTIONDIALOG 34, 22, 144, 75 + WS_SAVEBITS | FS_DLGBORDER | FS_NOMOVEWITHOWNER, + FCF_DLGBORDER | FCF_TITLEBAR | FCF_SYSMENU + BEGIN + END +END + +/* +////////////////////////////////////////////////////////////////////////////// +// Dummy dialog for dialog boxes without caption & with thin frame +////////////////////////////////////////////////////////////////////////////// +*/ +DLGTEMPLATE ID_NOCAPTIONDIALOG PRELOAD MOVEABLE DISCARDABLE +BEGIN + DIALOG "" ID_NOCAPTIONDIALOG 34, 22, 144, 75 + WS_SAVEBITS | FS_NOMOVEWITHOWNER, + FCF_BORDER + BEGIN + END +END + diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc index 3cbaa827c4..34cc33c491 100644 --- a/include/wx/os2/wx.rc +++ b/include/wx/os2/wx.rc @@ -1,167 +1,84 @@ -///////////////////////////////////////////////////////////////////////////// -// 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 +#include "wxrsc.h" -////////////////////////////////////////////////////////////////////////////// -// -// Dummy Dialog for all wxCAPTION Dialog boxes -// +/* ////////////////////////////////////////////////////////////////////////////// -// // This is the MDI Window menu -// - -wxWindowMenu MENU DISCARDABLE +////////////////////////////////////////////////////////////////////////////// +*/ +MENU ID_WINDOW_MENU PRELOAD BEGIN - SUBMENU "&Window" + SUBMENU "~Window", 131 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 +/* ////////////////////////////////////////////////////////////////////////////// -// -// 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" - +// Standard winWindows Cursors ////////////////////////////////////////////////////////////////////////////// -// -// 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_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" - -////////////////////////////////////////////////////////////////////////////// -// -// Bitmaps -// - -BITMAP wxDISABLE_BUTTON_BITMAP LOADONCALL "wx/os2/disable.bmp" - - -// For src/generic/proplist.cpp -BITMAP tick_bmp LOADONCALL "wx/os2/tick.bmp" -BITMAP cross_bmp LOADONCALL "wx/os2/cross.bmp" - -////////////////////////////////////////////////////////////////////////////// -// -// Main Frame Window menu for wxWindows OS/2 -// -// OS/2 menues must be created from a resource file or binary menu template -// loaded from a resource file via a DosGetResource call. To keep interface -// compatability with other ports the default wxMenu constructor loads the -// below menu. Users can them add or delete menu items as they see fit in -// their own wxMenu derived classes or add them dynamically. -// - -MENU IDR_MAIN -{ - SUBMENU "~File", IDM_FILE, MIS_TEXT - { - MENUITEM "~New", IDM_FILENEW, MIS_TEXT - MENUITEM "~Open...\tCtrl+O", IDM_FILEOPEN, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "~Save...\tCtrl+O", IDM_FILESAVE, MIS_TEXT - MENUITEM "Save ~as...", IDM_FILESAVEAS, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "E~xit...", ID_CANCEL, MIS_TEXT - } - - SUBMENU "~Edit", IDM_EDIT, MIS_TEXT - { - MENUITEM "~Undo\tAlt+Backspace", IDM_EDITUNDO, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "Cu~t\tShift+Delete", IDM_EDITCUT, MIS_TEXT - MENUITEM "~Copy\tCtrl+Insert", IDM_EDITCOPY, MIS_TEXT - MENUITEM "~Paste\tShift+Insert", IDM_EDITPASTE, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "Cl~ear\tDelete", IDM_EDITCLEAR, MIS_TEXT - } +POINTER WINCURSOR_HAND LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\hand.ptr" +POINTER WINCURSOR_BULLSEYE LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\bullseye.ptr" +POINTER WINCURSOR_PENCIL LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pencil.ptr" +POINTER WINCURSOR_MAGNIFIER LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\magnit1.ptr" +POINTER WINCURSOR_NO_ENTRY LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\noentry.ptr" +POINTER WINCURSOR_SIZING LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\size.ptr" +POINTER WINCURSOR_ROLLER LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\roller.ptr" +POINTER WINCURSOR_WATCH LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\watch.ptr" +POINTER WINCURSOR_PBRUSH LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pbrush.ptr" +POINTER WINCURSOR_PLEFT LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pntleft.ptr" +POINTER WINCURSOR_PRIGHT LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pntright.ptr" +POINTER WINCURSOR_QARROW LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\query.ptr" +POINTER WINCURSOR_BLANK LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\blank.ptr" /* - * Application specific menus go here. - */ +////////////////////////////////////////////////////////////////////////////// +// Default Icons +////////////////////////////////////////////////////////////////////////////// +*/ +/* Standard icons */ +ICON kICON_TIP PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\tip.ico" - SUBMENU "~Help", IDM_HELP, MIS_TEXT - { - MENUITEM "Help ~index", IDM_HELPINDEX, MIS_TEXT - MENUITEM "~General help", IDM_HELPGENERAL, MIS_TEXT - MENUITEM "~Using help", IDM_HELPUSINGHELP, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "~About", IDM_HELPABOUT, MIS_TEXT - } +ICON kICON_SMALL_CLOSED_FOLDER PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\folder1.ico" +ICON kICON_SMALL_OPEN_FOLDER PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\folder2.ico" +ICON kICON_SMALL_FILE PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\file.ico" +ICON kICON_SMALL_COMPUTER PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\computer.ico" +ICON kICON_SMALL_DRIVE PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\drive.ico" +ICON kICON_SMALL_CDROM PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\cdrom.ico" +ICON kICON_SMALL_FLOPPY PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\floppy.ico" +ICON kICON_SMALL_REMOVEABLE PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\removble.ico" -} +/* +////////////////////////////////////////////////////////////////////////////// +// Bitmaps +////////////////////////////////////////////////////////////////////////////// +*/ +BITMAP kDISABLE_BUTTON_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\disable.bmp" -ACCELTABLE IDR_MAIN -{ - VK_BACKSPACE, IDM_EDITUNDO, VIRTUALKEY, ALT - VK_DELETE, IDM_EDITCUT, VIRTUALKEY, SHIFT - VK_INSERT, IDM_EDITCOPY, VIRTUALKEY, CONTROL - VK_INSERT, IDM_EDITPASTE, VIRTUALKEY, SHIFT - VK_DELETE, IDM_EDITCLEAR, VIRTUALKEY -} +/* +// For src/generic/proplist.cpp +*/ +BITMAP kTICK_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\tick.bmp" +BITMAP kCROSS_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\cross.bmp" -STRINGTABLE -{ - IDS_OPEN "Open" - IDS_SAVE "Save" -} +/* +// For kContextHelpButton +*/ +BITMAP kCSQUERY_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\csquery.bmp" +/* +// For obtaining the RGB values of standard colours +*/ +BITMAP kBITMAP_STD_COLOURS LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\colours.bmp" + +RCINCLUDE "\DEV\WX2\WXWINDOWS\INCLUDE\WX\OS2\WX.DLG" diff --git a/include/wx/os2/wxos2.h b/include/wx/os2/wxos2.h deleted file mode 100644 index c5a5835cbc..0000000000 --- a/include/wx/os2/wxos2.h +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wxOs2.h -// Purpose: OS/2 resource defines -// Author: David Webster -// Modified by: -// Created: 02/26/00 -// RCS-ID: $Id$ -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_H_ -#define _WX_OS2_H_ - -// -// These are defines of wxOS2's standard frame resources -// - -#define IDR_MAIN 1 - -#define IDM_FILENEW 2000 -#define IDM_FILEOPEN 2001 -#define IDM_FILESAVE 2002 -#define IDM_FILESAVEAS 2003 - -#define IDM_EDIT 3000 -#define IDM_EDITUNDO 3001 -#define IDM_EDITCUT 3002 -#define IDM_EDITCOPY 3003 -#define IDM_EDITPASTE 3004 -#define IDM_EDITCLEAR 3005 - -#define IDM_HELP 8000 -#define IDM_HELPINDEX 8001 -#define IDM_HELPGENERAL 8002 -#define IDM_HELPUSINGHELP 8003 -#define IDM_HELPABOUT 8004 - -#define IDS_OPEN 20000 -#define IDS_SAVE 20001 - -#endif // _WX_OS2_H_ - diff --git a/include/wx/os2/wxrsc.h b/include/wx/os2/wxrsc.h new file mode 100644 index 0000000000..e4f8f839d8 --- /dev/null +++ b/include/wx/os2/wxrsc.h @@ -0,0 +1,48 @@ +/* +// Pointer ID's +*/ +#define WXCURSOR_HAND 100 +#define WXCURSOR_BULLSEYE 101 +#define WXCURSOR_PENCIL 102 +#define WXCURSOR_MAGNIFIER 103 +#define WXCURSOR_NO_ENTRY 104 +#define WXCURSOR_SIZING 105 +#define WXCURSOR_ROLLER 106 +#define WXCURSOR_WATCH 107 +#define WXCURSOR_PBRUSH 108 +#define WXCURSOR_PLEFT 109 +#define WXCURSOR_PRIGHT 110 +#define WXCURSOR_QARROW 111 +#define WXCURSOR_BLANK 112 + +/* +// Icon Ids +*/ +#define wxICON_TIP 113 +#define wxICON_SMALL_CLOSED_FOLDER 114 +#define wxICON_SMALL_OPEN_FOLDER 115 +#define wxICON_SMALL_FILE 116 +#define wxICON_SMALL_COMPUTER 117 +#define wxICON_SMALL_DRIVE 118 +#define wxICON_SMALL_CDROM 119 +#define wxICON_SMALL_FLOPPY 120 +#define wxICON_SMALL_REMOVEABLE 121 + +/* +// Bitmap Ids +*/ +#define wxDISABLE_BUTTON_BITMAP 122 +#define wxTICK_BITMAP 123 +#define wxCROSS_BITMAP 124 +#define wxCSQUERY_BITMAP 125 +#define wxBITMAP_STD_COLOURS 126 + +/* +// Dialog Ids -- must match enums in Toplevel.cpp +*/ +#define ID_RESIZEABLEDIALOG 127 +#define ID_CAPTIONDIALOG 128 +#define ID_NOCAPTIONDIALOG 129 + +#define ID_WINDDOW_MENU 130 +