fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 19ae615e707bdef45da73729263ef263e2d5992f..07f8ba9750f57d92f2850928b1dae0026ca04239 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -77,7 +77,7 @@ license is as follows:
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_IMAGE && wxUSE_XPM
+#if wxUSE_XPM

 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"


@@ -96,7 +96,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 bool wxXPMHandler::LoadFile(wxImage *image,
                             wxInputStream& stream,
 
 bool wxXPMHandler::LoadFile(wxImage *image,
                             wxInputStream& stream,

-                            bool verbose, int WXUNUSED(index))
+                            bool WXUNUSED(verbose), int WXUNUSED(index))

 {
     wxXPMDecoder decoder;
 
 {
     wxXPMDecoder decoder;
 


@@ -222,4 +222,4 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 
 #endif  // wxUSE_STREAMS
 
 
 #endif  // wxUSE_STREAMS
 

-#endif // wxUSE_XPM && wxUSE_IMAGE
+#endif // wxUSE_XPM