check for wxOnAssert reentrancy

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 19ae615e707bdef45da73729263ef263e2d5992f..7d3bced364b6307a1b5170759f4d51fb2824e038 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -77,7 +77,6 @@ license is as follows:
 #  include "wx/defs.h"
 #endif
 
-#if wxUSE_IMAGE && wxUSE_XPM
 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
@@ -96,7 +95,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 bool wxXPMHandler::LoadFile(wxImage *image,
                             wxInputStream& stream,
-                            bool verbose, int WXUNUSED(index))
+                            bool WXUNUSED(verbose), int WXUNUSED(index))
 {
     wxXPMDecoder decoder;
 
@@ -222,4 +221,3 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 
 #endif  // wxUSE_STREAMS
 
-#endif // wxUSE_XPM && wxUSE_IMAGE