Fixed wxPropertyGridManager::CreatePropertyGrid(), corrected documentation about...

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 82bb30b7ab3a596cc25ad97a33758e3aac54be9c..88e77178e9881cb68e801e613fc180dc2d2b78bf 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -28,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
 
 // ----------------------------------------------------------------------------
@@ -47,16 +47,16 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
 
 
 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);
 }
@@ -126,21 +126,6 @@ void wxBitmapBase::CleanUpHandlers()
     }
 }
 
-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)