only set focus on textctrl item if it exists (exists if combo box is editable)

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 0c41c5255d1b5e6009d18f972aee312b46f60dd8..b70f3e23bf21b418f4903d67890db42d803a403e 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
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "imaglist.h"
 #endif
- 
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,62 +19,100 @@
 #endif
 
 #include "wx/generic/imaglist.h"
+#include "wx/icon.h"
+#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 //  wxImageList
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
+
+#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+/*
+ * wxImageList has to be a real class or we have problems with
+ * the run-time information.
+ */
 
-wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+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();
 }
 
-bool wxImageList::Create()
+bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+{
+    m_width = width;
+    m_height = height;
+
+    return Create();
+}
+
+bool wxGenericImageList::Create()
 {
     m_images.DeleteContents( TRUE );
     return TRUE;
 }
 
-int wxImageList::Add( const wxBitmap &bitmap )
+int wxGenericImageList::Add( const 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();
+    return m_images.Number()-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 );
-    
-    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 )
+
+bool wxGenericImageList::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) ;
 
@@ -89,51 +127,51 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
         m_images.DeleteNode( node );
         m_images.Insert( next, newBitmap );
     }
-  
+
     return TRUE;
 }
 
-bool wxImageList::Remove( int index )
+bool wxGenericImageList::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()
+bool wxGenericImageList::RemoveAll()
 {
     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;
-    
+
     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;
 }
 
-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) )
 {
     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)))