Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of updates for color dialog and sliders

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-22 03:27:36 +00:00
parent a99acbb00a
commit 10769d8c47
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/os2/bitmap.h
View File

@@ -74,7 +74,7 @@ public:
// Copy constructors
inline wxBitmap(const wxBitmap& rBitmap)
{ Init(); Ref(rBitmap); }
{ Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }
// Initialize with raw data
wxBitmap( const char bits[]
@@ -223,14 +223,9 @@ public:
inline bool IsMono(void) const { return m_bIsMono; }
// An OS/2 version that probably doesn't do anything like the msw version
wxBitmap GetBitmapForDC(wxDC& rDc) const;
// inline LONG GetId() const
// { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
protected:
// common part of all ctors
void Init();

2
include/wx/os2/toplevel.h
View File

@@ -16,7 +16,7 @@
#pragma interface "toplevel.h"
#endif
enum ETemplateID { kResizeableDialog = 127
enum ETemplateID { kResizeableDialog = 130
,kCaptionDialog
,kNoCaptionDialog
};

3
include/wx/os2/wx.rc
View File

@@ -56,6 +56,9 @@ ICON wxICON_SMALL_DRIVE PRELOAD "\\dev\\wx2\\wxwindows\\include
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"
/*
//////////////////////////////////////////////////////////////////////////////

21
include/wx/os2/wxrsc.h
View File

@@ -27,22 +27,25 @@
#define wxICON_SMALL_CDROM 119
#define wxICON_SMALL_FLOPPY 120
#define wxICON_SMALL_REMOVEABLE 121
#define wxICON_SMALL_ERROR 122
#define wxICON_SMALL_INFO 123
#define wxICON_SMALL_WARNING 124
/*
// Bitmap Ids
*/
#define wxDISABLE_BUTTON_BITMAP 122
#define wxTICK_BITMAP 123
#define wxCROSS_BITMAP 124
#define wxCSQUERY_BITMAP 125
#define wxBITMAP_STD_COLOURS 126
#define wxDISABLE_BUTTON_BITMAP 125
#define wxTICK_BITMAP 126
#define wxCROSS_BITMAP 127
#define wxCSQUERY_BITMAP 128
#define wxBITMAP_STD_COLOURS 129
/*
// Dialog Ids -- must match enums in Toplevel.cpp
*/
#define ID_RESIZEABLEDIALOG 127
#define ID_CAPTIONDIALOG 128
#define ID_NOCAPTIONDIALOG 129
#define ID_RESIZEABLEDIALOG 130
#define ID_CAPTIONDIALOG 131
#define ID_NOCAPTIONDIALOG 132
#define ID_WINDOW_MENU 130
#define ID_WINDOW_MENU 133