Initial work on virtual file system support for the WebKitGTK+ backend. It now suppor...

[wxWidgets.git] / src / common / bmpbase.cpp

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 2f0776eaca602728e3182ce17156e382e44cf172..34bf85608ed8911b2be3e0a6d818d06f1a0e4a19 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -32,6 +32,11 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT)
 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
 // ----------------------------------------------------------------------------
@@ -51,12 +56,12 @@ 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);
 }
@@ -151,11 +156,11 @@ wxBitmap::wxBitmap(const char* const* bits)
 
 #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__))