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

applied fix to fix BCC's wxBitmap ctor problem

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-04-11 18:04:34 +00:00
parent 809f39fe42
commit 2aeec9eccc
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gdicmn.h
View File

@@ -48,7 +48,7 @@ class WXDLLEXPORT wxString;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Bitmap flags // Bitmap flags
enum enum wxBitmapType
{ {
wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility! wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility!
wxBITMAP_TYPE_BMP, wxBITMAP_TYPE_BMP,

2
include/wx/msw/bitmap.h
View File

@@ -83,7 +83,7 @@ public:
wxBitmap(char **data) { CreateFromXpm((const char **)data); } wxBitmap(char **data) { CreateFromXpm((const char **)data); }
// Load a file or resource // Load a file or resource
wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE); wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
// New constructor for generalised creation from data // New constructor for generalised creation from data
wxBitmap(void *data, long type, int width, int height, int depth = 1); wxBitmap(void *data, long type, int width, int height, int depth = 1);

2
src/msw/bitmap.cpp
View File

@@ -302,7 +302,7 @@ wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
(void)Create(data, type, width, height, depth); (void)Create(data, type, width, height, depth);
} }
wxBitmap::wxBitmap(const wxString& filename, long type) wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
{ {
Init(); Init();