do take the toolbar into account for Windows CE, otherwise the menus overlap with...

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 12f621afce17934a1027001e00b83544209eee3a..ea69fbfaf2fe3d5be4cac42eac550996f3d215ac 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imaglist.h"
 #endif
 
 #pragma implementation "imaglist.h"
 #endif
 


@@ -21,28 +21,39 @@
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"
 #include "wx/image.h"

+#include "wx/dc.h"

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

-IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)

 
 

-wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+/*
+ * wxImageList has to be a real class or we have problems with
+ * the run-time information.
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)
+#endif
+
+wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )

 {
     (void)Create(width, height, mask, initialCount);
 }
 
 {
     (void)Create(width, height, mask, initialCount);
 }
 

-wxImageList::~wxImageList()
+wxGenericImageList::~wxGenericImageList()

 {
 {

+    (void)RemoveAll();

 }
 
 }
 

-int wxImageList::GetImageCount() const
+int wxGenericImageList::GetImageCount() const

 {
 {

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

 }
 
 }
 

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

 {
     m_width = width;
     m_height = height;
 {
     m_width = width;
     m_height = height;


@@ -50,119 +61,126 @@ bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUS
     return Create();
 }
 
     return Create();
 }
 

-bool wxImageList::Create()
+bool wxGenericImageList::Create()

 {
 {

-    m_images.DeleteContents( TRUE );

     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxImageList::Add( const wxBitmap &bitmap )
+int wxGenericImageList::Add( const wxBitmap &bitmap )

 {
 {

+    wxASSERT_MSG( bitmap.GetWidth() == m_width &&
+                    bitmap.GetHeight() == m_height,
+                  _T("invalid bitmap size in wxImageList: this might work ")
+                  _T("on this platform but definitely won't under Windows.") );
+

     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
     else
         m_images.Append( new wxBitmap(bitmap) );
     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
     else
         m_images.Append( new wxBitmap(bitmap) );

-    return m_images.Number()-1;
+    return m_images.GetCount()-1;

 }
 
 }
 

-int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
+int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )

 {
     wxBitmap bmp(bitmap);
 {
     wxBitmap bmp(bitmap);

-    bmp.SetMask(new wxMask(mask));
+    if (mask.Ok())
+        bmp.SetMask(new wxMask(mask));

     return Add(bmp);
 }
 
     return Add(bmp);
 }
 

-int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
+int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )

 {
 {

-    wxImage img(bitmap);
+    wxImage img = bitmap.ConvertToImage();

     img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
     img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());

-    return Add(img.ConvertToBitmap());
+    return Add(wxBitmap(img));

 }
 
 }
 

-const wxBitmap *wxImageList::GetBitmap( int index ) const
+const wxBitmap *wxGenericImageList::GetBitmap( int index ) const

 {
 {

-    wxNode *node = m_images.Nth( index );
+    wxList::compatibility_iterator node = m_images.Item( 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->GetData();

 }
 
 }
 

-bool wxImageList::Replace( int index, const wxBitmap &bitmap )
+bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )

 {
 {

-    wxNode *node = m_images.Nth( index );
+    wxList::compatibility_iterator node = m_images.Item( index );

 
     wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
 
 
     wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
 

-    wxBitmap* newBitmap = NULL;
-    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
-#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) ;
-
-    if (index == m_images.Number()-1)
+    wxBitmap* newBitmap = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ?
+                             #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)
+                               new wxBitmap(bitmap)
+                             #else
+                               new wxBitmap( (const wxIcon&) bitmap )
+                             #endif
+                               : new wxBitmap(bitmap) ;
+
+    if (index == (int) m_images.GetCount() - 1)

     {
     {

-        m_images.DeleteNode( node );
+        delete node->GetData();
+        m_images.Erase( node );

         m_images.Append( newBitmap );
     }
     else
     {
         m_images.Append( newBitmap );
     }
     else
     {

-        wxNode *next = node->Next();
-        m_images.DeleteNode( node );
+        wxList::compatibility_iterator next = node->GetNext();
+        delete node->GetData();
+        m_images.Erase( node );

         m_images.Insert( next, newBitmap );
     }
 
     return TRUE;
 }
 
         m_images.Insert( next, newBitmap );
     }
 
     return TRUE;
 }
 

-bool wxImageList::Remove( int index )
+bool wxGenericImageList::Remove( int index )

 {
 {

-    wxNode *node = m_images.Nth( index );
+    wxList::compatibility_iterator node = m_images.Item( 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 );
+    delete node->GetData();
+    m_images.Erase( node );

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-bool wxImageList::RemoveAll()
+bool wxGenericImageList::RemoveAll()

 {
 {

+    WX_CLEAR_LIST(wxList, m_images);

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

-bool wxImageList::GetSize( int index, int &width, int &height ) const
+bool wxGenericImageList::GetSize( int index, int &width, int &height ) const

 {
     width = 0;
     height = 0;
 
 {
     width = 0;
     height = 0;
 

-    wxNode *node = m_images.Nth( index );
+    wxList::compatibility_iterator node = m_images.Item( 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();
+    wxBitmap *bm = (wxBitmap*)node->GetData();

     width = bm->GetWidth();
     height = bm->GetHeight();
 
     return TRUE;
 }
 
     width = bm->GetWidth();
     height = bm->GetHeight();
 
     return TRUE;
 }
 

-bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
+bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,

                         int flags, bool WXUNUSED(solidBackground) )
 {
                         int flags, bool WXUNUSED(solidBackground) )
 {

-    wxNode *node = m_images.Nth( index );
+    wxList::compatibility_iterator node = m_images.Item( 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();
+    wxBitmap *bm = (wxBitmap*)node->GetData();

 
     if (bm->IsKindOf(CLASSINFO(wxIcon)))
         dc.DrawIcon( * ((wxIcon*) bm), x, y);
 
     if (bm->IsKindOf(CLASSINFO(wxIcon)))
         dc.DrawIcon( * ((wxIcon*) bm), x, y);