X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d4ca3aa8f594848a8f68140b25ec86549e12e98..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/bmpbase.cpp?ds=inline diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index 8715e67d10..88e77178e9 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/common/bmpbase.cpp // Purpose: wxBitmapBase // Author: VaclavSlavik // Created: 2001/04/11 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bitmapbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,27 +15,48 @@ #pragma hdrstop #endif -#include "wx/wx.h" -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/palette.h" #include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/log.h" -#include "wx/image.h" -#include "wx/module.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" + #include "wx/icon.h" + #include "wx/image.h" +#endif // WX_PRECOMP + +// ---------------------------------------------------------------------------- +// wxVariant support +// ---------------------------------------------------------------------------- + +#if wxUSE_VARIANT +IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT) +IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT) +#endif + +// ---------------------------------------------------------------------------- +// wxBitmapBase +// ---------------------------------------------------------------------------- + +#if wxUSE_BITMAP_BASE + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/palette.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); } @@ -50,74 +67,130 @@ bool wxBitmapBase::RemoveHandler(const wxString& name) if ( handler ) { sm_handlers.DeleteObject(handler); - return TRUE; + return true; } else - return FALSE; + return false; } wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name) { - wxNode *node = sm_handlers.First(); + wxList::compatibility_iterator node = sm_handlers.GetFirst(); while ( node ) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); + wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); if ( handler->GetName() == name ) return handler; - node = node->Next(); + node = node->GetNext(); } return NULL; } wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType) { - wxNode *node = sm_handlers.First(); + wxList::compatibility_iterator node = sm_handlers.GetFirst(); while ( node ) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); + wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); if ( handler->GetExtension() == extension && - (bitmapType == -1 || handler->GetType() == bitmapType) ) + (bitmapType == wxBITMAP_TYPE_ANY || handler->GetType() == bitmapType) ) return handler; - node = node->Next(); + node = node->GetNext(); } return NULL; } wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType) { - wxNode *node = sm_handlers.First(); + wxList::compatibility_iterator node = sm_handlers.GetFirst(); while ( node ) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); + wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); if (handler->GetType() == bitmapType) return handler; - node = node->Next(); + node = node->GetNext(); } return NULL; } void wxBitmapBase::CleanUpHandlers() { - wxNode *node = sm_handlers.First(); + wxList::compatibility_iterator node = sm_handlers.GetFirst(); while ( node ) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - wxNode *next = node->Next(); + wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); + wxList::compatibility_iterator next = node->GetNext(); delete handler; - delete node; + sm_handlers.Erase(node); node = next; } } - - 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 +// ---------------------------------------------------------------------------- + +bool wxMaskBase::Create(const wxBitmap& bitmap, const wxColour& colour) +{ + FreeData(); + + return InitFromColour(bitmap, colour); +} + +#if wxUSE_PALETTE + +bool wxMaskBase::Create(const wxBitmap& bitmap, int paletteIndex) +{ + wxPalette *pal = bitmap.GetPalette(); + + wxCHECK_MSG( pal, false, + wxT("Cannot create mask from palette index of a bitmap without palette") ); + + unsigned char r,g,b; + pal->GetRGB(paletteIndex, &r, &g, &b); + + return Create(bitmap, wxColour(r, g, b)); +} + +#endif // wxUSE_PALETTE + +bool wxMaskBase::Create(const wxBitmap& bitmap) +{ + FreeData(); + + return InitFromMonoBitmap(bitmap); +}