X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4f6dbf62ad37b7d766361ec55a2c131c762e53c..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/bmpbase.cpp diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index 4a5ca4d898..88e77178e9 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -20,6 +20,7 @@ #ifndef WX_PRECOMP #include "wx/colour.h" #include "wx/icon.h" + #include "wx/image.h" #endif // WX_PRECOMP // ---------------------------------------------------------------------------- @@ -27,8 +28,8 @@ // ---------------------------------------------------------------------------- #if wxUSE_VARIANT -IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT) -IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT) +IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT) +IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT) #endif // ---------------------------------------------------------------------------- @@ -41,22 +42,21 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT) #include "wx/log.h" #include "wx/utils.h" #include "wx/palette.h" - #include "wx/image.h" #include "wx/module.h" #endif // WX_PRECOMP IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject) -IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase,wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject) wxList wxBitmapBase::sm_handlers; -void wxBitmapBase::AddHandler(wxBitmapHandlerBase *handler) +void wxBitmapBase::AddHandler(wxBitmapHandler *handler) { sm_handlers.Append(handler); } -void wxBitmapBase::InsertHandler(wxBitmapHandlerBase *handler) +void wxBitmapBase::InsertHandler(wxBitmapHandler *handler) { sm_handlers.Insert(handler); } @@ -131,14 +131,35 @@ class wxBitmapBaseModule: public wxModule DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule) public: wxBitmapBaseModule() {} - bool OnInit() { wxBitmap::InitStandardHandlers(); return true; }; - void OnExit() { wxBitmap::CleanUpHandlers(); }; + bool OnInit() { wxBitmap::InitStandardHandlers(); return true; } + void OnExit() { wxBitmap::CleanUpHandlers(); } }; IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule) #endif // wxUSE_BITMAP_BASE +// ---------------------------------------------------------------------------- +// wxBitmap common +// ---------------------------------------------------------------------------- + +#if !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)) + +wxBitmap::wxBitmap(const char* const* bits) +{ + wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data")); + +#if wxUSE_IMAGE && wxUSE_XPM + wxImage image(bits); + wxCHECK2_MSG(image.Ok(), return, wxT("invalid bitmap data")); + + *this = wxBitmap(image); +#else + wxFAIL_MSG(_T("creating bitmaps from XPMs not supported")); +#endif // wxUSE_IMAGE && wxUSE_XPM +} +#endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)) + // ---------------------------------------------------------------------------- // wxMaskBase // ----------------------------------------------------------------------------