Add a length parameter for wxRegEx::Matches

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index cd9bf9886ab75b704036dbaf4d6a8c5216c41e41..aeeb09fef813fade38cb6a77393bfe59ab02b6a9 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -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"
 


@@ -27,7 +23,7 @@
     #include "wx/bitmap.h"
 #endif
 
     #include "wx/bitmap.h"
 #endif
 

-#ifndef _WX_IMAGE_H_
+#if wxUSE_IMAGE && !defined(_WX_IMAGE_H_)

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


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


@@ -74,6 +75,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