More Motif stuff incl. beginnings of wxToolBar

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 61819c387aba02e92c09219ef7e689ce7cca33ad..20a5101650ff4c1e86298536a1dd89d8b06ec40d 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -25,29 +25,37 @@ wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUS
   m_width = width;
   m_height = height;
   Create();
-};
+}
 
 wxImageList::~wxImageList()
 {
-};
+}
 
 int wxImageList::GetImageCount() const
 {
   return m_images.Number();
-};
+}
 
 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();
-};
+}
 
+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 );
@@ -63,23 +71,23 @@ bool wxImageList::Replace( 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( int index )
 {
   wxNode *node = m_images.Nth( index );
   if (node) m_images.DeleteNode( node );
   return (node != NULL);
-};
+}
 
 bool wxImageList::RemoveAll()
 {
   m_images.Clear();
   return TRUE;
-};
+}
 
 bool wxImageList::GetSize( int index, int &width, int &height ) const
 {
@@ -105,10 +113,10 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
     width = 0;
     height = 0;
     return FALSE;
-  };
+  }
 
 #endif  
-};
+}
 
 bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
@@ -126,7 +134,7 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
       (m_height != bm->GetHeight()))
   {
     bm->Resize( m_width, m_height );
-  };
+  }
   
 #endif  
   
@@ -134,6 +142,6 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
   dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
 
   return TRUE;
-};
+}