Redid parts of wxScroledWindow

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 368a72735a259320367b4cb4527137267461c56b..ad91a211e0a2032cc6c46fc18f031283b1a4b3a3 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -2,9 +2,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,33 +19,43 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
-wxImageList::wxImageList(void)
+wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
 {
+  m_width = width;
+  m_height = height;
   Create();
-};
+}
 
-wxImageList::~wxImageList(void)
+wxImageList::~wxImageList()
 {
-};
+}
 
-int wxImageList::GetImageCount(void) const
+int wxImageList::GetImageCount() const
 {
   return m_images.Number();
-};
+}
 
-bool wxImageList::Create(void)
+bool wxImageList::Create()
 {
   m_images.DeleteContents( TRUE );
   return TRUE;
-};
+}
 
 int wxImageList::Add( const wxBitmap &bitmap )
 {
   m_images.Append( new wxBitmap(bitmap) );
   return m_images.Number();
-};
+}
 
-bool wxImageList::Replace( const int index, const wxBitmap &bitmap )
+const wxBitmap *wxImageList::GetBitmap(int index) const {
+  wxNode *node = m_images.Nth(index);
+  if (node != NULL)
+    return (wxBitmap*)node->Data();
+
+  return (wxBitmap *) NULL;
+}
+    
+bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 {
   wxNode *node = m_images.Nth( index );
   if (!node) return FALSE;
@@ -61,25 +70,25 @@ bool wxImageList::Replace( const int index, const wxBitmap &bitmap )
     wxNode *next = node->Next();
     m_images.DeleteNode( node );
     m_images.Insert( next, new wxBitmap(bitmap) );
-  };
+  }
   
   return TRUE;
-};
+}
 
-bool wxImageList::Remove( const int index )
+bool wxImageList::Remove( int index )
 {
   wxNode *node = m_images.Nth( index );
   if (node) m_images.DeleteNode( node );
   return (node != NULL);
-};
+}
 
-bool wxImageList::RemoveAll(void)
+bool wxImageList::RemoveAll()
 {
   m_images.Clear();
   return TRUE;
-};
+}
 
-bool wxImageList::GetSize( const 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)
@@ -94,19 +103,19 @@ bool wxImageList::GetSize( const int index, int &width, int &height ) const
     width = 0;
     height = 0;
     return FALSE;
-  };
-};
+  }
+}
 
-bool wxImageList::Draw( const int index, wxDC &dc, 
-                        const int x, const int y,
-                        const int WXUNUSED(flags), const 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 );
+  
+  dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
+
   return TRUE;
-};
+}