Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed XPM handler from wxImage's standard handlers, let's see if it does any harm

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-12-09 21:03:25 +00:00
parent 9d683b445c
commit 1de1d24e96
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/imagall.cpp
View File

@@ -60,11 +60,7 @@ void wxInitAllImageHandlers()
wxImage::AddHandler( new wxCURHandler ); wxImage::AddHandler( new wxCURHandler );
wxImage::AddHandler( new wxANIHandler ); wxImage::AddHandler( new wxANIHandler );
#endif #endif
#if wxUSE_XPM && (defined(__WXGTK__) || defined(__WXMOTIF__)) #if wxUSE_XPM
// 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 ); wxImage::AddHandler( new wxXPMHandler );
#endif #endif
} }

7
src/common/image.cpp
View File

@@ -1267,13 +1267,6 @@ void wxImage::InitStandardHandlers()
#if wxUSE_STREAMS #if wxUSE_STREAMS
AddHandler(new wxBMPHandler); AddHandler(new wxBMPHandler);
#endif // wxUSE_STREAMS #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() void wxImage::CleanUpHandlers()