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

fixed Vadim's removal of XPM handler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-12-08 13:20:49 +00:00
parent 39bc7d8020
commit 64e9f56b80
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/imagall.cpp
View File

@@ -60,6 +60,13 @@ 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__))
// 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 #endif // wxUSE_IMAGE

3
src/common/image.cpp
View File

@@ -1269,6 +1269,9 @@ void wxImage::InitStandardHandlers()
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__) #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); AddHandler(new wxXPMHandler);
#endif #endif
} }