avoid calling wxSystemSettings::GetMetric() from wxIconBundle::GetIcon() unless the...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 4a0b326a6491259fc9feb0d4a2686e17e6706858..e15376f5bb2bc8f8307c7ad72c02d5f46bc4d1bd 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -78,16 +78,29 @@ void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type)
 
 const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const
 {
 
 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;
     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;
     {
         if( !m_icons[i].Ok() )
             continue;


@@ -105,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 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;
 }
 
     return *tmp;
 }