applied fix to fix BCC's wxBitmap ctor problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,7 +48,7 @@ class WXDLLEXPORT wxString;
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// Bitmap flags
|
||||
enum
|
||||
enum wxBitmapType
|
||||
{
|
||||
wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility!
|
||||
wxBITMAP_TYPE_BMP,
|
||||
|
@@ -83,7 +83,7 @@ public:
|
||||
wxBitmap(char **data) { CreateFromXpm((const char **)data); }
|
||||
|
||||
// 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
|
||||
wxBitmap(void *data, long type, int width, int height, int depth = 1);
|
||||
|
@@ -302,7 +302,7 @@ wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
|
||||
(void)Create(data, type, width, height, depth);
|
||||
}
|
||||
|
||||
wxBitmap::wxBitmap(const wxString& filename, long type)
|
||||
wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
|
||||
{
|
||||
Init();
|
||||
|
||||
|
Reference in New Issue
Block a user