Rich text lib separation.

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

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index c5a9eb383c06ba61a9be3e99afc4b082f2e1e858..bc437495c03bbe7c8249f318aee13d46e43f76bf 100644 (file)
--- 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$
 // Purpose:     wxImage access all handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$


@@ -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"
 


@@ -20,11 +15,12 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#  include "wx/setup.h"

 #endif
 
 #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
 //-----------------------------------------------------------------------------
 // This function allows dynamic access to all image handlers compile within
 // the library. This function should be in a separate file as some compilers


@@ -38,6 +34,9 @@ void wxInitAllImageHandlers()
 #if wxUSE_LIBJPEG
   wxImage::AddHandler( new wxJPEGHandler );
 #endif
 #if wxUSE_LIBJPEG
   wxImage::AddHandler( new wxJPEGHandler );
 #endif

+#if wxUSE_LIBTIFF
+  wxImage::AddHandler( new wxTIFFHandler );
+#endif

 #if wxUSE_GIF
   wxImage::AddHandler( new wxGIFHandler );
 #endif
 #if wxUSE_GIF
   wxImage::AddHandler( new wxGIFHandler );
 #endif


@@ -47,4 +46,17 @@ void wxInitAllImageHandlers()
 #if wxUSE_PCX
   wxImage::AddHandler( new wxPCXHandler );
 #endif
 #if wxUSE_PCX
   wxImage::AddHandler( new wxPCXHandler );
 #endif

+#if wxUSE_IFF
+  wxImage::AddHandler( new wxIFFHandler );
+#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