another segfault fix

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index c4b2b8bed5bf34724daf510fe1c60d47df11f32d..9f62b5e7c0ab41f02959858061dff05e95bd46e9 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -107,8 +107,6 @@ void wxBitmap::Init()
 {
     // m_refData = NULL; done in the base class ctor
 
 {
     // m_refData = NULL; done in the base class ctor
 

-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 #ifdef __WIN32__
 }
 
 #ifdef __WIN32__


@@ -222,8 +220,6 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 
 wxBitmap::~wxBitmap()
 {
 
 wxBitmap::~wxBitmap()
 {

-    if (wxTheBitmapList)
-        wxTheBitmapList->DeleteObject(this);

 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)


@@ -435,8 +431,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     if (depth == -1) depth = wxDisplayDepth();
     SetDepth( depth );
 
     if (depth == -1) depth = wxDisplayDepth();
     SetDepth( depth );
 

+#if wxUSE_PALETTE

     // Copy the palette from the source image
     SetPalette(image.GetPalette());
     // Copy the palette from the source image
     SetPalette(image.GetPalette());

+#endif // wxUSE_PALETTE

 
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
 
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);


@@ -616,8 +614,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     GetBitmapData()->SetOk();
 #endif // WXWIN_COMPATIBILITY_2
 
     GetBitmapData()->SetOk();
 #endif // WXWIN_COMPATIBILITY_2
 

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-

     return TRUE;
 #endif
 }
     return TRUE;
 #endif
 }