Applied patch [ 638561 ] Allow SetFont(wxNullFont) in wxGTK

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

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index c5a9eb383c06ba61a9be3e99afc4b082f2e1e858..aaf6d459c78a3868eef60279aba8a9312a0d90a3 100644 (file)
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -25,6 +25,8 @@
 
 #include "wx/image.h"
 
 
 #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 +40,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 +52,21 @@ 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 && (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()
+  wxImage::AddHandler( new wxXPMHandler );
+#endif

 }
 }

+
+#endif // wxUSE_IMAGE