From 1de1d24e9640199394a5f891eb158f1a8230cba0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 9 Dec 2002 21:03:25 +0000 Subject: [PATCH] removed XPM handler from wxImage's standard handlers, let's see if it does any harm git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagall.cpp | 6 +----- src/common/image.cpp | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp index aaf6d459c7..42f2e50f95 100644 --- a/src/common/imagall.cpp +++ b/src/common/imagall.cpp @@ -60,11 +60,7 @@ void wxInitAllImageHandlers() 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() +#if wxUSE_XPM wxImage::AddHandler( new wxXPMHandler ); #endif } diff --git a/src/common/image.cpp b/src/common/image.cpp index f26ae13855..a9201c2aaf 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -1267,13 +1267,6 @@ void wxImage::InitStandardHandlers() #if wxUSE_STREAMS AddHandler(new wxBMPHandler); #endif // wxUSE_STREAMS - -#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__) - // NB: keep this #ifdef in sync with the one in imagall.cpp - - // they must complement each other so that there's always exactly - // one XPM handler added after calling wxInitAllImageHandlers() - AddHandler(new wxXPMHandler); -#endif } void wxImage::CleanUpHandlers() -- 2.45.2