Committing in .

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

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index aaf6d459c78a3868eef60279aba8a9312a0d90a3..bb4d3dc7ddbc5f5a8687533f6338c2e818f6a16e 100644 (file)
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-   We don't put pragma implement in this file because it is already present in
-   src/common/image.cpp
-*/
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -60,11 +55,7 @@ void wxInitAllImageHandlers()
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif

-#if wxUSE_XPM && (defined(__WXGTK__) || defined(__WXMOTIF__))
-  // NB: keep this #ifdef in sync with the one in image.cpp
-  //     (wxImage::InitStandardHandlers) - they must complement each other
-  //     so that there's always exactly one XPM handler added after calling
-  //     wxInitAllImageHandlers()
+#if wxUSE_XPM

   wxImage::AddHandler( new wxXPMHandler );
 #endif
 }
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 }