X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b46ecac6415b5c9d76bfca160163aa5dbfd0256..16553659df1a8fee8b19cc9a8ff8321711fe983c:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 200f9705ee..aa9fa411f6 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -125,15 +125,14 @@ public: // Copy constructors inline wxBitmap(const wxBitmap& bitmap) { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); } - inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); } // Initialize with raw data wxBitmap(const char bits[], int width, int height, int depth = 1); -#if USE_XPM_IN_MSW +#if wxUSE_XPM_IN_MSW class wxItem; // Initialize with XPM data - wxBitmap(const char **data, wxItem *anItem = NULL); + wxBitmap(char **data, wxItem *anItem = NULL); #endif // Load a file or resource