argh, another IsDialogMessage() fix: we still need to check all non top level parents

[wxWidgets.git] / src / generic / imaglist.cpp

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 92d7369c708ba193b40a5a111475b81f77e1501e..64995176e2728a5c001a81be0fa3a51cb41e5514 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imaglist.cpp
+// Name:        generic/imaglist.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -28,11 +28,9 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 

-wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+wxImageList::wxImageList( int width, int height, bool mask, int initialCount )

 {
 {

-    m_width = width;
-    m_height = height;
-    Create();
+    (void)Create(width, height, mask, initialCount);

 }
 
 wxImageList::~wxImageList()
 }
 
 wxImageList::~wxImageList()


@@ -44,6 +42,14 @@ int wxImageList::GetImageCount() const
     return m_images.Number();
 }
 
     return m_images.Number();
 }
 

+bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+{
+    m_width = width;
+    m_height = height;
+
+    return Create();
+}
+

 bool wxImageList::Create()
 {
     m_images.DeleteContents( TRUE );
 bool wxImageList::Create()
 {
     m_images.DeleteContents( TRUE );


@@ -62,15 +68,16 @@ int wxImageList::Add( const wxBitmap &bitmap )
 int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 {
     wxBitmap bmp(bitmap);
 int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 {
     wxBitmap bmp(bitmap);

-    bmp.SetMask(new wxMask(mask));
+    if (mask.Ok())
+        bmp.SetMask(new wxMask(mask));

     return Add(bmp);
 }
 
 int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
 {
     return Add(bmp);
 }
 
 int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
 {

-    wxImage img(bitmap);
+    wxImage img = bitmap.ConvertToImage();

     img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
     img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());

-    return Add(img.ConvertToBitmap());
+    return Add(wxBitmap(img));

 }
 
 const wxBitmap *wxImageList::GetBitmap( int index ) const
 }
 
 const wxBitmap *wxImageList::GetBitmap( int index ) const