#pragma hdrstop
#endif
+#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+ #include "wx/icon.h"
+ #include "wx/image.h"
+#endif // WX_PRECOMP
+
// ----------------------------------------------------------------------------
-// wxBitmapBase
+// wxVariant support
// ----------------------------------------------------------------------------
-#include "wx/bitmap.h"
+#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/colour.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/palette.h"
- #include "wx/icon.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);
}
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(wxT("creating bitmaps from XPMs not supported"));
+#endif // wxUSE_IMAGE && wxUSE_XPM
+}
+#endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
+
// ----------------------------------------------------------------------------
// wxMaskBase
// ----------------------------------------------------------------------------