IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT)
#endif
+#if wxUSE_EXTENDED_RTTI
+//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxBitmap>)
+//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxIcon>)
+#endif
+
// ----------------------------------------------------------------------------
// wxBitmapBase
// ----------------------------------------------------------------------------
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);
}
}
}
-bool wxBitmapHandlerBase::Create(wxBitmap*, const void*, long, int, int, int)
-{
- return false;
-}
-
-bool wxBitmapHandlerBase::LoadFile(wxBitmap*, const wxString&, long, int, int)
-{
- return false;
-}
-
-bool wxBitmapHandlerBase::SaveFile(const wxBitmap*, const wxString&, int, const wxPalette*)
-{
- return false;
-}
-
class wxBitmapBaseModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
#if wxUSE_IMAGE && wxUSE_XPM
wxImage image(bits);
- wxCHECK2_MSG(image.Ok(), return, wxT("invalid bitmap data"));
+ wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data"));
*this = wxBitmap(image);
#else
- wxFAIL_MSG(_T("creating bitmaps from XPMs not supported"));
+ wxFAIL_MSG(wxT("creating bitmaps from XPMs not supported"));
#endif // wxUSE_IMAGE && wxUSE_XPM
}
#endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))