wxTLW::SetLeft/RightMenu of smart phones documented.

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 54a0b03dc756587951b65e9b37a3d1ac2f94ab96..2fa83445344bcd6240a2375831d198d818ad6422 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "iconbndl.h"
 #endif
 
     #pragma implementation "iconbndl.h"
 #endif
 


@@ -24,9 +24,10 @@
     #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/intl.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
 


@@ -53,8 +54,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

     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 +79,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