a tad bit more padding

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index ef64f80fae6d7299a178a87f962199c70788f8dc..e15376f5bb2bc8f8307c7ad72c02d5f46bc4d1bd 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        iconbndl.cpp
+// Name:        src/common/iconbndl.cpp

 // Purpose:     wxIconBundle
 // Author:      Mattia Barbon
 // Created:     23.03.2002
 // Purpose:     wxIconBundle
 // Author:      Mattia Barbon
 // Created:     23.03.2002


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "iconbndl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,18 +15,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/iconbndl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-#endif
-
-#ifndef _WX_IMAGE_H_
+    #include "wx/bitmap.h"

     #include "wx/image.h"
 #endif
 
     #include "wx/image.h"
 #endif
 

-#include "wx/iconbndl.h"

 #include "wx/arrimpl.cpp"
 
 WX_DEFINE_OBJARRAY(wxIconArray)
 #include "wx/arrimpl.cpp"
 
 WX_DEFINE_OBJARRAY(wxIconArray)


@@ -53,12 +48,16 @@ void wxIconBundle::DeleteIcons()
     m_icons.Empty();
 }
 
     m_icons.Empty();
 }
 

+#if wxUSE_IMAGE

 void wxIconBundle::AddIcon( const wxString& file, long type )
 void wxIconBundle::AddIcon( const wxString& file, long type )

+#else
+void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type) )
+#endif

 {
 {

+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

     size_t count = wxImage::GetImageCount( file, type );
     size_t i;
     wxImage image;
     size_t count = wxImage::GetImageCount( file, type );
     size_t i;
     wxImage image;

-    wxIcon tmp;

 
     for( i = 0; i < count; ++i )
     {
 
     for( i = 0; i < count; ++i )
     {


@@ -69,26 +68,49 @@ void wxIconBundle::AddIcon( const wxString& file, long type )
             continue;
         }
 
             continue;
         }
 

-        tmp.CopyFromBitmap( wxBitmap( image ) );
-        AddIcon( tmp );
+        wxIcon* tmp = new wxIcon();
+        tmp->CopyFromBitmap( wxBitmap( image ) );
+        AddIcon( *tmp );
+        delete tmp;

     }
     }

+#endif

 }
 
 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 );
     wxCoord sysX = wxSystemSettings::GetMetric( wxSYS_ICON_X ),
             sysY = wxSystemSettings::GetMetric( wxSYS_ICON_Y );

-    wxIcon* sysIcon = 0;

 
 

-    for( i = 0; i < max; ++i )
+    wxIcon *sysIcon = 0;
+
+    for( size_t i = 0; i < max; i++ )

     {
         if( !m_icons[i].Ok() )
             continue;
         wxCoord sx = m_icons[i].GetWidth(), sy = m_icons[i].GetHeight();
         // requested size
         if( sx == size.x && sy == size.y )
     {
         if( !m_icons[i].Ok() )
             continue;
         wxCoord sx = m_icons[i].GetWidth(), sy = m_icons[i].GetHeight();
         // requested size
         if( sx == size.x && sy == size.y )

-            return m_icons[i];
+        {
+            tmp = &m_icons[i]; // fix for broken BCC
+            return *tmp;
+        }

         // keep track if there is a system-size icon
         if( sx == sysX && sy == sysY )
             sysIcon = &m_icons[i];
         // keep track if there is a system-size icon
         if( sx == sysX && sy == sysY )
             sysIcon = &m_icons[i];


@@ -96,8 +118,9 @@ 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
-    return max > 0 ? m_icons[0] : wxNullIcon;
+    // we certainly have at least one icon thanks to the <=1 check above
+    tmp = &m_icons[0];
+    return *tmp;

 }
 
 void wxIconBundle::AddIcon( const wxIcon& icon )
 }
 
 void wxIconBundle::AddIcon( const wxIcon& icon )