Motif cell highlighting problem fixed

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 103d86d9e5ce8dcddc56130a7479660e011139a4..b0dc6594c747ca113abeca02dc0c707654b4aba8 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -2,9 +2,8 @@
 // Name:        imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,7 +11,14 @@
 #pragma implementation "imaglist.h"
 #endif
  
 #pragma implementation "imaglist.h"
 #endif
  

-#include "wx/imaglist.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "wx/generic/imaglist.h"

 
 //-----------------------------------------------------------------------------
 //  wxImageList
 
 //-----------------------------------------------------------------------------
 //  wxImageList


@@ -20,93 +26,122 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 

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

 {
 {

-  Create();
-};
+    m_width = width;
+    m_height = height;
+    Create();
+}

 
 wxImageList::~wxImageList()
 {
 
 wxImageList::~wxImageList()
 {

-};
+}

 
 int wxImageList::GetImageCount() const
 {
 
 int wxImageList::GetImageCount() const
 {

-  return m_images.Number();
-};
+    return m_images.Number();
+}

 
 bool wxImageList::Create()
 {
 
 bool wxImageList::Create()
 {

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

 
 int wxImageList::Add( const wxBitmap &bitmap )
 {
 
 int wxImageList::Add( const wxBitmap &bitmap )
 {

-  m_images.Append( new wxBitmap(bitmap) );
-  return m_images.Number();
-};
+    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
+        m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
+    else
+        m_images.Append( new wxBitmap(bitmap) );
+    return m_images.Number();
+}

 
 

+const wxBitmap *wxImageList::GetBitmap( int index ) const 
+{
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, (wxBitmap *) NULL, "wrong index in image list" );
+    
+    return (wxBitmap*)node->Data();
+}
+    

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

-  wxNode *node = m_images.Nth( index );
-  if (!node) return FALSE;
-  
-  if (index == m_images.Number()-1)
-  {
-    m_images.DeleteNode( node );
-    m_images.Append( new wxBitmap(bitmap) );
-  }
-  else
-  {
-    wxNode *next = node->Next();
-    m_images.DeleteNode( node );
-    m_images.Insert( next, new wxBitmap(bitmap) );
-  };
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, FALSE, "wrong index in image list" );
+
+    wxBitmap* newBitmap = NULL;
+    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
+        newBitmap = new wxIcon( (const wxIcon&) bitmap );
+    else
+        newBitmap = new wxBitmap(bitmap) ;
+
+    if (index == m_images.Number()-1)
+    {
+        m_images.DeleteNode( node );
+        m_images.Append( newBitmap );
+    }
+    else
+    {
+        wxNode *next = node->Next();
+        m_images.DeleteNode( node );
+        m_images.Insert( next, newBitmap );
+    }

   
   

-  return TRUE;
-};
+    return TRUE;
+}

 
 bool wxImageList::Remove( int index )
 {
 
 bool wxImageList::Remove( int index )
 {

-  wxNode *node = m_images.Nth( index );
-  if (node) m_images.DeleteNode( node );
-  return (node != NULL);
-};
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, FALSE, "wrong index in image list" );
+    
+    m_images.DeleteNode( node );
+     
+    return TRUE;
+}

 
 bool wxImageList::RemoveAll()
 {
 
 bool wxImageList::RemoveAll()
 {

-  m_images.Clear();
-  return TRUE;
-};
+    m_images.Clear();
+    
+    return TRUE;
+}

 
 bool wxImageList::GetSize( int index, int &width, int &height ) const
 {
 
 bool wxImageList::GetSize( int index, int &width, int &height ) const
 {

-  wxNode *node = m_images.Nth( index );
-  if (node)
-  {
+    width = 0;
+    height = 0;
+    
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, FALSE, "wrong index in image list" );
+    

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

+    

     return TRUE;
     return TRUE;

-  }
-  else
-  {
-    width = 0;
-    height = 0;
-    return FALSE;
-  };
-};
+}

 
 

-bool wxImageList::Draw( int index, wxDC &dc, 
-                        int x, int y,
-                        int WXUNUSED(flags), bool WXUNUSED(solidBackground) )
+bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
+                        int flags, bool WXUNUSED(solidBackground) )

 {
 {

-  wxNode *node = m_images.Nth( index );
-  if (!node) return FALSE;
-  wxBitmap *bm = (wxBitmap*)node->Data();
-  wxIcon *icon = (wxIcon*)bm;
-  dc.DrawIcon( *icon, x, y );
-  return TRUE;
-};
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, FALSE, "wrong index in image list" );
+    
+    wxBitmap *bm = (wxBitmap*)node->Data();
+
+    if (bm->IsKindOf(CLASSINFO(wxIcon)))
+        dc.DrawIcon( * ((wxIcon*) bm), x, y);
+    else
+        dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
+
+    return TRUE;
+}