added wxUmaskChanger class and wxCHANGE_UMASK macro and use them instead of duplicati...

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 58deee8873b4e17d7efbd667f61224aaf4a29ccb..2fa83445344bcd6240a2375831d198d818ad6422 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "iconbndl.h"
 #endif
 
@@ -24,9 +24,10 @@
     #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/bitmap.h"
 #endif
 
-#ifndef _WX_IMAGE_H_
+#if wxUSE_IMAGE && !defined(_WX_IMAGE_H_)
     #include "wx/image.h"
 #endif
 
@@ -53,12 +54,16 @@ void wxIconBundle::DeleteIcons()
     m_icons.Empty();
 }
 
+#if wxUSE_IMAGE
 void wxIconBundle::AddIcon( const wxString& file, long type )
+#else
+void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type) )
+#endif
 {
+#if wxUSE_IMAGE
     size_t count = wxImage::GetImageCount( file, type );
     size_t i;
     wxImage image;
-    wxIcon tmp;
 
     for( i = 0; i < count; ++i )
     {
@@ -69,9 +74,12 @@ void wxIconBundle::AddIcon( const wxString& file, long type )
             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