resource loader structure added for loading menu bar, apple menu will not get multipl...

[wxWidgets.git] / src / mgl / bitmap.cpp

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 0520051d37d233516b80ca4fa5f3fc21ee890066..039406b2f436dbfa57a0727e65d9df3ad9662335 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -191,16 +191,9 @@ wxBitmapRefData::~wxBitmapRefData()
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler,wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase)
 
-wxBitmap::wxBitmap()
-{
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-}
-
 wxBitmap::wxBitmap(int width, int height, int depth)
 {
     Create(width, height, depth);
-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
 }
 
 
@@ -285,12 +278,10 @@ bool wxBitmap::CreateFromXpm(const char **bits)
     
     *this = wxBitmap(img);
     
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-
     return TRUE;
 }
 
-wxBitmap::wxBitmap(const wxImage& image, int depth = -1)
+wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
     long width, height;
 
@@ -370,15 +361,11 @@ wxImage wxBitmap::ConvertToImage() const
 wxBitmap::wxBitmap(const wxBitmap& bmp)
 {
     Ref(bmp);
-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
 }
 
 wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
 {
     LoadFile(filename, type);
-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
@@ -393,13 +380,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     bdc->clearDevice();
     bdc->putMonoImage(0, 0, width, (width + 7) / 8, height, (void*)bits);
     delete bdc;
-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-}
-
-wxBitmap::~wxBitmap()
-{
-    if ( wxTheBitmapList ) wxTheBitmapList->DeleteObject(this);
 }
 
 wxBitmap& wxBitmap::operator = (const wxBitmap& bmp)