missing commit

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index aa0e88d75652ccdfeedbb4676c0431264f99bc79..4ca54a6e75fbd1c909989f3f1dabe65a529f8f1b 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -1,42 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "imaglist.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/generic/imaglist.h"
-#include "wx/icon.h"
-#include "wx/image.h"
-#include "wx/dc.h"
+#if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST)
+
+#include "wx/imaglist.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif

 
 //-----------------------------------------------------------------------------
 //  wxImageList
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
 
 //-----------------------------------------------------------------------------
 //  wxImageList
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)

-
-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
-/*
- * wxImageList has to be a real class or we have problems with
- * the run-time information.
- */
-

 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)

-#endif

 
 wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
 {
 
 wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
 {


@@ -45,6 +38,7 @@ wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int in
 
 wxGenericImageList::~wxGenericImageList()
 {
 
 wxGenericImageList::~wxGenericImageList()
 {

+    (void)RemoveAll();

 }
 
 int wxGenericImageList::GetImageCount() const
 }
 
 int wxGenericImageList::GetImageCount() const


@@ -62,23 +56,55 @@ bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int
 
 bool wxGenericImageList::Create()
 {
 
 bool wxGenericImageList::Create()
 {

-    m_images.DeleteContents( TRUE );
-    return TRUE;
+    return true;

 }
 
 int wxGenericImageList::Add( const wxBitmap &bitmap )
 {
 }
 
 int wxGenericImageList::Add( const wxBitmap &bitmap )
 {

-    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
+    wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height)
+                  || (m_width == 0 && m_height == 0),
+                  wxT("invalid bitmap size in wxImageList: this might work ")
+                  wxT("on this platform but definitely won't under Windows.") );
+
+    const int index = int(m_images.GetCount());
+
+    if (bitmap.IsKindOf(wxCLASSINFO(wxIcon)))
+    {

         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );

+    }

     else
     else

-        m_images.Append( new wxBitmap(bitmap) );
-    return m_images.GetCount()-1;
+    {
+        // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added
+        // bitmap into sub-images of the correct size
+        if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
+        {
+            int numImages = bitmap.GetWidth() / m_width;
+            for (int subIndex = 0; subIndex < numImages; subIndex++)
+            {
+                wxRect rect(m_width * subIndex, 0, m_width, m_height);
+                wxBitmap tmpBmp = bitmap.GetSubBitmap(rect);
+                m_images.Append( new wxBitmap(tmpBmp) );
+            }
+        }
+        else
+        {
+            m_images.Append( new wxBitmap(bitmap) );
+        }
+    }
+
+    if (m_width == 0 && m_height == 0)
+    {
+        m_width = bitmap.GetWidth();
+        m_height = bitmap.GetHeight();
+    }
+
+    return index;

 }
 
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 {
     wxBitmap bmp(bitmap);
 }
 
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 {
     wxBitmap bmp(bitmap);

-    if (mask.Ok())
+    if (mask.IsOk())

         bmp.SetMask(new wxMask(mask));
     return Add(bmp);
 }
         bmp.SetMask(new wxMask(mask));
     return Add(bmp);
 }


@@ -90,64 +116,126 @@ int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour
     return Add(wxBitmap(img));
 }
 
     return Add(wxBitmap(img));
 }
 

-const wxBitmap *wxGenericImageList::GetBitmap( int index ) const
+const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const

 {
 {

-    wxNode *node = m_images.Item( index );
+    wxObjectList::compatibility_iterator node = m_images.Item( index );

 
 

-    wxCHECK_MSG( node, (wxBitmap *) NULL, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, NULL, wxT("wrong index in image list") );

 
     return (wxBitmap*)node->GetData();
 }
 
 
     return (wxBitmap*)node->GetData();
 }
 

+// Get the bitmap
+wxBitmap wxGenericImageList::GetBitmap(int index) const
+{
+    const wxBitmap* bmp = GetBitmapPtr(index);
+    if (bmp)
+        return *bmp;
+    else
+        return wxNullBitmap;
+}
+
+// Get the icon
+wxIcon wxGenericImageList::GetIcon(int index) const
+{
+    const wxBitmap* bmp = GetBitmapPtr(index);
+    if (bmp)
+    {
+        wxIcon icon;
+        icon.CopyFromBitmap(*bmp);
+        return icon;
+    }
+    else
+        return wxNullIcon;
+}
+

 bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 {
 bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 {

-    wxNode *node = m_images.Item( index );
+    wxObjectList::compatibility_iterator node = m_images.Item( index );

 
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
 

-    wxBitmap* newBitmap = NULL;
-    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
-#if defined(__VISAGECPP__)
-//just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
-//so construct it from a bitmap object until I can figure this nonsense out. (DW)
-        newBitmap = new wxBitmap(bitmap) ;
-#else
-        newBitmap = new wxBitmap( (const wxIcon&) bitmap );
-#endif
+    wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ?
+                             #if defined(__VISAGECPP__)
+                               //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
+                               //so construct it from a bitmap object until I can figure this nonsense out. (DW)
+                               new wxBitmap(bitmap)
+                             #else
+                               new wxBitmap( (const wxIcon&) bitmap )
+                             #endif
+                               : new wxBitmap(bitmap) ;
+
+    if (index == (int) m_images.GetCount() - 1)
+    {
+        delete node->GetData();
+        m_images.Erase( node );
+        m_images.Append( newBitmap );
+    }

     else
     else

-        newBitmap = new wxBitmap(bitmap) ;
+    {
+        wxObjectList::compatibility_iterator next = node->GetNext();
+        delete node->GetData();
+        m_images.Erase( node );
+        m_images.Insert( next, newBitmap );
+    }
+
+    return true;
+}
+
+bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask )
+{
+    wxObjectList::compatibility_iterator node = m_images.Item( index );
+
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );
+
+    wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ?
+                             #if defined(__VISAGECPP__)
+                               //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
+                               //so construct it from a bitmap object until I can figure this nonsense out. (DW)
+                               new wxBitmap(bitmap)
+                             #else
+                               new wxBitmap( (const wxIcon&) bitmap )
+                             #endif
+                               : new wxBitmap(bitmap) ;

 
     if (index == (int) m_images.GetCount() - 1)
     {
 
     if (index == (int) m_images.GetCount() - 1)
     {

-        m_images.DeleteNode( node );
+        delete node->GetData();
+        m_images.Erase( node );

         m_images.Append( newBitmap );
     }
     else
     {
         m_images.Append( newBitmap );
     }
     else
     {

-        wxNode *next = node->GetNext();
-        m_images.DeleteNode( node );
+        wxObjectList::compatibility_iterator next = node->GetNext();
+        delete node->GetData();
+        m_images.Erase( node );

         m_images.Insert( next, newBitmap );
     }
 
         m_images.Insert( next, newBitmap );
     }
 

-    return TRUE;
+    if (mask.IsOk())
+        newBitmap->SetMask(new wxMask(mask));
+
+    return true;

 }
 
 bool wxGenericImageList::Remove( int index )
 {
 }
 
 bool wxGenericImageList::Remove( int index )
 {

-    wxNode *node = m_images.Item( index );
+    wxObjectList::compatibility_iterator node = m_images.Item( index );

 
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
 

-    m_images.DeleteNode( node );
+    delete node->GetData();
+    m_images.Erase( node );

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericImageList::RemoveAll()
 {
 }
 
 bool wxGenericImageList::RemoveAll()
 {

+    WX_CLEAR_LIST(wxObjectList, m_images);

     m_images.Clear();
 
     m_images.Clear();
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
 }
 
 bool wxGenericImageList::GetSize( int index, int &width, int &height ) const


@@ -155,32 +243,32 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
     width = 0;
     height = 0;
 
     width = 0;
     height = 0;
 

-    wxNode *node = m_images.Item( index );
+    wxObjectList::compatibility_iterator node = m_images.Item( index );

 
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
     wxBitmap *bm = (wxBitmap*)node->GetData();
     width = bm->GetWidth();
     height = bm->GetHeight();
 
 
     wxBitmap *bm = (wxBitmap*)node->GetData();
     width = bm->GetWidth();
     height = bm->GetHeight();
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
 {
 }
 
 bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
 {

-    wxNode *node = m_images.Item( index );
+    wxObjectList::compatibility_iterator node = m_images.Item( index );

 
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
     wxBitmap *bm = (wxBitmap*)node->GetData();
 
 
     wxBitmap *bm = (wxBitmap*)node->GetData();
 

-    if (bm->IsKindOf(CLASSINFO(wxIcon)))
+    if (bm->IsKindOf(wxCLASSINFO(wxIcon)))

         dc.DrawIcon( * ((wxIcon*) bm), x, y);
     else
         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
 
         dc.DrawIcon( * ((wxIcon*) bm), x, y);
     else
         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
 

-    return TRUE;
+    return true;

 }
 
 }
 

-
+#endif // wxUSE_IMAGLIST