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 2fa83445344bcd6240a2375831d198d818ad6422..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
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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,6 +15,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/iconbndl.h"
+

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


@@ -31,7 +29,6 @@
     #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)


@@ -60,7 +57,7 @@ void wxIconBundle::AddIcon( const wxString& file, long type )
 void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type) )
 #endif
 {
 void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type) )
 #endif
 {

-#if wxUSE_IMAGE
+#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;