no changes, just resolved a conflict

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

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index ca44263ad6b496586331a873f8f8ad537e850b86..42f2e50f95743b9354d910a6e021d00d2cec70a1 100644 (file)
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -60,6 +60,9 @@ void wxInitAllImageHandlers()
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif
+#if wxUSE_XPM
+  wxImage::AddHandler( new wxXPMHandler );
+#endif
 }
 
 #endif // wxUSE_IMAGE