Unicode compilation fixes

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 8011b2b6486313512638ed30a59fa4395820aff7..aa3a2922080ae0b27b0c18f1ca7f992a0d5c21b2 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

- 
+

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


@@ -20,6 +20,7 @@
 
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"
 
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"

+#include "wx/image.h"

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


@@ -27,11 +28,9 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 

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

 {
 {

-    m_width = width;
-    m_height = height;
-    Create();
+    (void)Create(width, height, mask, initialCount);

 }
 
 wxImageList::~wxImageList()
 }
 
 wxImageList::~wxImageList()


@@ -43,6 +42,14 @@ int wxImageList::GetImageCount() const
     return m_images.Number();
 }
 
     return m_images.Number();
 }
 

+bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+{
+    m_width = width;
+    m_height = height;
+
+    return Create();
+}
+

 bool wxImageList::Create()
 {
     m_images.DeleteContents( TRUE );
 bool wxImageList::Create()
 {
     m_images.DeleteContents( TRUE );


@@ -58,24 +65,45 @@ int wxImageList::Add( const wxBitmap &bitmap )
     return m_images.Number()-1;
 }
 
     return m_images.Number()-1;
 }
 

-const wxBitmap *wxImageList::GetBitmap( int index ) const 
+int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
+{
+    wxBitmap bmp(bitmap);
+    if (mask.Ok())
+        bmp.SetMask(new wxMask(mask));
+    return Add(bmp);
+}
+
+int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
+{
+    wxImage img(bitmap);
+    img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
+    return Add(img.ConvertToBitmap());
+}
+
+const wxBitmap *wxImageList::GetBitmap( int index ) const

 {
     wxNode *node = m_images.Nth( index );
 {
     wxNode *node = m_images.Nth( index );

-    
+

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

-    
+

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

-    
+

 bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 {
     wxNode *node = m_images.Nth( index );
 bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 {
     wxNode *node = m_images.Nth( index );

-    
+

     wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
 
     wxBitmap* newBitmap = NULL;
     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
     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) ;
 
     else
         newBitmap = new wxBitmap(bitmap) ;
 


@@ -90,25 +118,25 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
         m_images.DeleteNode( node );
         m_images.Insert( next, newBitmap );
     }
         m_images.DeleteNode( node );
         m_images.Insert( next, newBitmap );
     }

-  
+

     return TRUE;
 }
 
 bool wxImageList::Remove( int index )
 {
     wxNode *node = m_images.Nth( index );
     return TRUE;
 }
 
 bool wxImageList::Remove( int index )
 {
     wxNode *node = m_images.Nth( 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 );
     m_images.DeleteNode( node );

-     
+

     return TRUE;
 }
 
 bool wxImageList::RemoveAll()
 {
     m_images.Clear();
     return TRUE;
 }
 
 bool wxImageList::RemoveAll()
 {
     m_images.Clear();

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -116,15 +144,15 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
 {
     width = 0;
     height = 0;
 {
     width = 0;
     height = 0;

-    
+

     wxNode *node = m_images.Nth( index );
     wxNode *node = m_images.Nth( 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->Data();
     width = bm->GetWidth();
     height = bm->GetHeight();
     wxBitmap *bm = (wxBitmap*)node->Data();
     width = bm->GetWidth();
     height = bm->GetHeight();

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -132,9 +160,9 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
 {
     wxNode *node = m_images.Nth( index );
                         int flags, bool WXUNUSED(solidBackground) )
 {
     wxNode *node = m_images.Nth( 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->Data();
 
     if (bm->IsKindOf(CLASSINFO(wxIcon)))
     wxBitmap *bm = (wxBitmap*)node->Data();
 
     if (bm->IsKindOf(CLASSINFO(wxIcon)))