X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b6b4dfcf48af89d910df5a21786fbcd02db8c97..ccb5db57cdb1766eefb7023dda50ede9f0d01f78:/src/common/imagall.cpp

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index ed408ec1df..060d9c78b0 100644
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagall.cpp
+// Name:        src/common/imagall.cpp
 // Purpose:     wxImage access all handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
@@ -7,26 +7,19 @@
 // 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"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_IMAGE
+
 #ifndef WX_PRECOMP
-#  include "wx/setup.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
-#if wxUSE_IMAGE
-
 //-----------------------------------------------------------------------------
 // This function allows dynamic access to all image handlers compile within
 // the library. This function should be in a separate file as some compilers
@@ -55,14 +48,14 @@ void wxInitAllImageHandlers()
 #if wxUSE_IFF
   wxImage::AddHandler( new wxIFFHandler );
 #endif
-#if wxUSE_XPM
-  wxImage::AddHandler( new wxXPMHandler );
-#endif
 #if wxUSE_ICO_CUR
   wxImage::AddHandler( new wxICOHandler );
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif
+#if wxUSE_XPM
+  wxImage::AddHandler( new wxXPMHandler );
+#endif
 }
 
 #endif // wxUSE_IMAGE