Make IsOfClass out-of-line to defend against gcc 3.4.[56] bug:

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 54a0b03dc756587951b65e9b37a3d1ac2f94ab96..afdb96b826136783a03c2797e75ee99a8d16dfe1 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,20 @@
     #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"

+    #include "wx/bitmap.h"

 #endif
 
 #endif
 

-#ifndef _WX_IMAGE_H_
+#if wxUSE_IMAGE && !defined(_WX_IMAGE_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,8 +51,13 @@ 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;


@@ -73,6 +76,7 @@ void wxIconBundle::AddIcon( const wxString& file, long type )
         AddIcon( *tmp );
         delete tmp;
     }
         AddIcon( *tmp );
         delete tmp;
     }

+#endif

 }
 
 const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const
 }
 
 const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const