avoid conflict between wxBookCtrlBase::DoSetSelection() and the derived classes;...

[wxWidgets.git] / src / common / iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index afdb96b826136783a03c2797e75ee99a8d16dfe1..e15376f5bb2bc8f8307c7ad72c02d5f46bc4d1bd 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -23,9 +23,6 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
-#endif
-
-#if wxUSE_IMAGE && !defined(_WX_IMAGE_H_)
     #include "wx/image.h"
 #endif
 
@@ -81,16 +78,29 @@ void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type)
 
 const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const
 {
-    size_t i, max = m_icons.GetCount();
+    // temp. variable needed to fix Borland C++ 5.5.1 problem
+    // with passing a return value through two functions
+    wxIcon *tmp;
+
+    size_t max = m_icons.GetCount();
+
+    // if we have one or no icon, we can return now without doing more work:
+    if ( max <= 1 )
+    {
+        if ( max == 1 ) // fix for broken BCC
+            tmp = &m_icons[0];
+        else // max == 0
+            tmp = &wxNullIcon;
+        return *tmp;
+    }
+
+    // there are more icons, find the best match:
     wxCoord sysX = wxSystemSettings::GetMetric( wxSYS_ICON_X ),
             sysY = wxSystemSettings::GetMetric( wxSYS_ICON_Y );
 
     wxIcon *sysIcon = 0;
-    // temp. variable needed to fix Borland C++ 5.5.1 problem
-    // with passing a return value through two functions
-    wxIcon *tmp;
 
-    for( i = 0; i < max; i++ )
+    for( size_t i = 0; i < max; i++ )
     {
         if( !m_icons[i].Ok() )
             continue;
@@ -108,11 +118,8 @@ const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const
 
     // return the system-sized icon if we've got one
     if( sysIcon ) return *sysIcon;
-    // return the first icon, if we have one
-    if( max > 0 ) // fix for broken BCC
-        tmp = &m_icons[0];
-    else
-        tmp = &wxNullIcon;
+    // we certainly have at least one icon thanks to the <=1 check above
+    tmp = &m_icons[0];
     return *tmp;
 }