fixed text control creation broken by my MacPreControlCreate() change

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 403cd4f13c8fc66369d49f38dade6c5eae7e6c89..9021b540cb11874ea166905fec3d496c3d783bde 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -20,56 +20,92 @@
 
 #include "wx/generic/imaglist.h"
 #include "wx/icon.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 WXUNUSED(mask), int WXUNUSED(initialCount) )
+#if !defined(__WXMSW__) || defined(__WIN16__) || 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 )

 {
 {

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

 }
 
 }
 

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

 {
 }
 
 {
 }
 

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

 {
 {

-    return m_images.Number();
+    return m_images.GetCount();
+}
+
+bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+{
+    m_width = width;
+    m_height = height;
+
+    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 wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
+{
+    wxBitmap bmp(bitmap);
+    if (mask.Ok())
+        bmp.SetMask(new wxMask(mask));
+    return Add(bmp);
+}
+
+int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
+{
+    wxImage img = bitmap.ConvertToImage();
+    img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
+    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") );
 


@@ -85,63 +121,67 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
     else
         newBitmap = new wxBitmap(bitmap) ;
 
     else
         newBitmap = new wxBitmap(bitmap) ;
 

-    if (index == m_images.Number()-1)
+    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);