From f1633a8f6aea2747c3fdaa3d8025fac1372e4633 Mon Sep 17 00:00:00 2001 From: David Webster Date: Fri, 25 Jan 2002 22:48:13 +0000 Subject: [PATCH] Resource file updates and setup to configure for generic dirdlg. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/setup0.h | 3 ++- include/wx/os2/wx.dlg | 2 +- include/wx/os2/wx.rc | 56 ++++++++++++++++++++--------------------- include/wx/os2/wxrsc.h | 2 +- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 12795aec32..ea8d31fe4b 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -329,7 +329,8 @@ #define wxUSE_PROGRESSDLG 1 // wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 +#define wxUSE_DIRDLG 1 +#define wxUSE_DIRDLGG 1 #define wxUSE_OWNER_DRAWN 1 // Owner-drawn menus and listboxes diff --git a/include/wx/os2/wx.dlg b/include/wx/os2/wx.dlg index 8cfb267c77..e4c73f8b46 100644 --- a/include/wx/os2/wx.dlg +++ b/include/wx/os2/wx.dlg @@ -1,4 +1,4 @@ -DLGINCLUDE 1 \\dev\\wx2\\wxwindows\\include\\wx\\os2\\wxrsc.h +DLGINCLUDE 1 \dev\wx2\wxwindows\include\wx\os2\wxrsc.h DLGTEMPLATE ID_RESIZEABLEDIALOG PRELOAD MOVEABLE DISCARDABLE BEGIN diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc index 34cc33c491..0c57c20e9c 100644 --- a/include/wx/os2/wx.rc +++ b/include/wx/os2/wx.rc @@ -26,19 +26,19 @@ END ////////////////////////////////////////////////////////////////////////////// */ -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" +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_NO_ENTRY LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\noentry.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_WATCH LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\watch.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" /* ////////////////////////////////////////////////////////////////////////////// @@ -46,39 +46,39 @@ POINTER WINCURSOR_BLANK LOADONCALL "\\prj\\win\\code\\z00\\resour ////////////////////////////////////////////////////////////////////////////// */ /* Standard icons */ -ICON kICON_TIP PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\tip.ico" +ICON wxICON_TIP PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\tip.ico" -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" +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" /* ////////////////////////////////////////////////////////////////////////////// // Bitmaps ////////////////////////////////////////////////////////////////////////////// */ -BITMAP kDISABLE_BUTTON_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\disable.bmp" +BITMAP wxDISABLE_BUTTON_BITMAP LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\disable.bmp" /* // 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" +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 kCSQUERY_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\csquery.bmp" +BITMAP wxCSQUERY_BITMAP LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\csquery.bmp" /* // For obtaining the RGB values of standard colours */ -BITMAP kBITMAP_STD_COLOURS LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\colours.bmp" +BITMAP wxBITMAP_STD_COLOURS LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\colours.bmp" -RCINCLUDE "\DEV\WX2\WXWINDOWS\INCLUDE\WX\OS2\WX.DLG" +RCINCLUDE \Dev\Wx2\WxWindows\INCLUDE\WX\OS2\WX.DLG diff --git a/include/wx/os2/wxrsc.h b/include/wx/os2/wxrsc.h index e4f8f839d8..f840a49e24 100644 --- a/include/wx/os2/wxrsc.h +++ b/include/wx/os2/wxrsc.h @@ -44,5 +44,5 @@ #define ID_CAPTIONDIALOG 128 #define ID_NOCAPTIONDIALOG 129 -#define ID_WINDDOW_MENU 130 +#define ID_WINDOW_MENU 130 -- 2.45.2