Streamline wxSocket code: wxSocketBase now uses wxSocketImpl (previously known

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

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index 454993388a5f10d3b6ff4ecc239b5cf77463ef40..87bac918c2a26f4d823ead73ca19cb8e1c70c0fb 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,26 +7,19 @@
 // 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"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/setup.h"
+    #include "wx/image.h"

 #endif
 
 #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


@@ -52,6 +45,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_TGA
+  wxImage::AddHandler( new wxTGAHandler );
+#endif

 #if wxUSE_XPM
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 #if wxUSE_XPM
   wxImage::AddHandler( new wxXPMHandler );
 #endif