cell attributes added (doesn't quite work, work in progress, beware, don't use, ...

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 686fd59f362b36e2b5b5583c40f0a91fa0fc1fe1..403cd4f13c8fc66369d49f38dade6c5eae7e6c89 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -10,7 +10,7 @@
 #ifdef __GNUG__
 #pragma implementation "imaglist.h"
 #endif
- 
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -58,24 +58,30 @@ int wxImageList::Add( const wxBitmap &bitmap )
     return m_images.Number()-1;
 }
 
-const wxBitmap *wxImageList::GetBitmap( int index ) const 
+const wxBitmap *wxImageList::GetBitmap( int index ) const
 {
     wxNode *node = m_images.Nth( index );
-    
-    wxCHECK_MSG( node, (wxBitmap *) NULL, T("wrong index in image list") );
-    
+
+    wxCHECK_MSG( node, (wxBitmap *) NULL, wxT("wrong index in image list") );
+
     return (wxBitmap*)node->Data();
 }
-    
+
 bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 {
     wxNode *node = m_images.Nth( index );
-    
-    wxCHECK_MSG( node, FALSE, T("wrong index in image list") );
+
+    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
 
     wxBitmap* newBitmap = NULL;
     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
-        newBitmap = new wxIcon( (const wxIcon&) bitmap );
+#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
     else
         newBitmap = new wxBitmap(bitmap) ;
 
@@ -90,25 +96,25 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
         m_images.DeleteNode( node );
         m_images.Insert( next, newBitmap );
     }
-  
+
     return TRUE;
 }
 
 bool wxImageList::Remove( int index )
 {
     wxNode *node = m_images.Nth( index );
-    
-    wxCHECK_MSG( node, FALSE, T("wrong index in image list") );
-    
+
+    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+
     m_images.DeleteNode( node );
-     
+
     return TRUE;
 }
 
 bool wxImageList::RemoveAll()
 {
     m_images.Clear();
-    
+
     return TRUE;
 }
 
@@ -116,15 +122,15 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
 {
     width = 0;
     height = 0;
-    
+
     wxNode *node = m_images.Nth( index );
-    
-    wxCHECK_MSG( node, FALSE, T("wrong index in image list") );
-    
+
+    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+
     wxBitmap *bm = (wxBitmap*)node->Data();
     width = bm->GetWidth();
     height = bm->GetHeight();
-    
+
     return TRUE;
 }
 
@@ -132,9 +138,9 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
 {
     wxNode *node = m_images.Nth( index );
-    
-    wxCHECK_MSG( node, FALSE, T("wrong index in image list") );
-    
+
+    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+
     wxBitmap *bm = (wxBitmap*)node->Data();
 
     if (bm->IsKindOf(CLASSINFO(wxIcon)))