From 64e9f56b807228891c5839a01d26db4e6e9e9139 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 8 Dec 2002 13:20:49 +0000 Subject: [PATCH] fixed Vadim's removal of XPM handler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagall.cpp | 7 +++++++ src/common/image.cpp | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp index ca44263ad6..aaf6d459c7 100644 --- a/src/common/imagall.cpp +++ b/src/common/imagall.cpp @@ -60,6 +60,13 @@ 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() + wxImage::AddHandler( new wxXPMHandler ); +#endif } #endif // wxUSE_IMAGE diff --git a/src/common/image.cpp b/src/common/image.cpp index 3e922fad22..f26ae13855 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -1269,6 +1269,9 @@ void wxImage::InitStandardHandlers() #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 } -- 2.45.2