honour wxSP_ARROW_KEYS in wxSpinCtrlGeneric and don't handle the arrows unless it...

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 5f342b70c4dae45be4cd54c3068ff005957a1cb5..87240c8aa2fa1b52fb852a92be336d5f7bbce558 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        src/generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,30 +14,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_IMAGLIST
+#if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST)

 
 #ifndef __WXPALMOS__
 
 
 #ifndef __WXPALMOS__
 

-#include "wx/generic/imaglist.h"
+#include "wx/imaglist.h"

 
 

-#include "wx/icon.h"
-#include "wx/image.h"
-#include "wx/dc.h"
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif

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

-
-#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)
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)

-#endif

 
 wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
 {
 
 wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
 {


@@ -69,15 +63,36 @@ bool wxGenericImageList::Create()
 
 int wxGenericImageList::Add( const wxBitmap &bitmap )
 {
 
 int wxGenericImageList::Add( const wxBitmap &bitmap )
 {

-    wxASSERT_MSG( (bitmap.GetWidth() == m_width && bitmap.GetHeight() == m_height)
+    wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height)

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

+    const int index = int(m_images.GetCount());
+

     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))

+    {

         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );

+    }

     else
     else

-        m_images.Append( new wxBitmap(bitmap) );
+    {
+        // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
+        // bitmap into sub-images of the correct size
+        if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
+        {
+            int numImages = bitmap.GetWidth() / m_width;
+            for (int subIndex = 0; subIndex < numImages; subIndex++)
+            {
+                wxRect rect(m_width * subIndex, 0, m_width, m_height);
+                wxBitmap tmpBmp = bitmap.GetSubBitmap(rect);
+                m_images.Append( new wxBitmap(tmpBmp) );
+            }
+        }
+        else
+        {
+            m_images.Append( new wxBitmap(bitmap) );
+        }
+    }

 
     if (m_width == 0 && m_height == 0)
     {
 
     if (m_width == 0 && m_height == 0)
     {


@@ -85,7 +100,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
         m_height = bitmap.GetHeight();
     }
 
         m_height = bitmap.GetHeight();
     }
 

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

 }
 
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 }
 
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )


@@ -105,9 +120,9 @@ int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour
 
 const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const
 {
 
 const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const
 {

-    wxList::compatibility_iterator node = m_images.Item( index );
+    wxObjectList::compatibility_iterator node = m_images.Item( index );

 
 

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

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


@@ -138,7 +153,7 @@ wxIcon wxGenericImageList::GetIcon(int index) const
 
 bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 {
 
 bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 {

-    wxList::compatibility_iterator node = m_images.Item( index );
+    wxObjectList::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") );
 


@@ -160,7 +175,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
     }
     else
     {
     }
     else
     {

-        wxList::compatibility_iterator next = node->GetNext();
+        wxObjectList::compatibility_iterator next = node->GetNext();

         delete node->GetData();
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
         delete node->GetData();
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );


@@ -171,7 +186,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 
 bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask )
 {
 
 bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask )
 {

-    wxList::compatibility_iterator node = m_images.Item( index );
+    wxObjectList::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") );
 


@@ -193,12 +208,12 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
     }
     else
     {
     }
     else
     {

-        wxList::compatibility_iterator next = node->GetNext();
+        wxObjectList::compatibility_iterator next = node->GetNext();

         delete node->GetData();
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }
         delete node->GetData();
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }

-    
+

     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 
     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 


@@ -207,7 +222,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
 
 bool wxGenericImageList::Remove( int index )
 {
 
 bool wxGenericImageList::Remove( int index )
 {

-    wxList::compatibility_iterator node = m_images.Item( index );
+    wxObjectList::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") );
 


@@ -219,7 +234,7 @@ bool wxGenericImageList::Remove( int index )
 
 bool wxGenericImageList::RemoveAll()
 {
 
 bool wxGenericImageList::RemoveAll()
 {

-    WX_CLEAR_LIST(wxList, m_images);
+    WX_CLEAR_LIST(wxObjectList, m_images);

     m_images.Clear();
 
     return true;
     m_images.Clear();
 
     return true;


@@ -230,7 +245,7 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
     width = 0;
     height = 0;
 
     width = 0;
     height = 0;
 

-    wxList::compatibility_iterator node = m_images.Item( index );
+    wxObjectList::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") );
 


@@ -244,7 +259,7 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
 bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
 {
 bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
 {

-    wxList::compatibility_iterator node = m_images.Item( index );
+    wxObjectList::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") );
 


@@ -258,5 +273,6 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
     return true;
 }
 
     return true;
 }
 

-#endif // wxUSE_IMAGLIST

 #endif // __WXPALMOS__
 #endif // __WXPALMOS__

+
+#endif // wxUSE_IMAGLIST