Add XPM handlers by default if XPM support is enabled

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-01-09 13:12:28 +00:00
parent 72c0d7d70e
commit f66f0fd7b4

View File

@@ -39,9 +39,14 @@
#include "wx/msw/dib.h" #include "wx/msw/dib.h"
#include "wx/msw/bitmap.h" #include "wx/msw/bitmap.h"
#include "wx/msw/gdiimage.h" #include "wx/msw/gdiimage.h"
#include "wx/bitmap.h"
#if wxUSE_XPM_IN_MSW
# include "wx/xpmhand.h"
#endif // wxUSE_XPM_IN_MSW
#ifdef __WIN16__ #ifdef __WIN16__
#include "wx/msw/curico.h" # include "wx/msw/curico.h"
#endif // __WIN16__ #endif // __WIN16__
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -296,10 +301,12 @@ void wxGDIImage::InitStandardHandlers()
AddHandler(new wxBMPResourceHandler); AddHandler(new wxBMPResourceHandler);
AddHandler(new wxBMPFileHandler); AddHandler(new wxBMPFileHandler);
// Not added by default: include xpmhand.h in your app // GRG: Add these handlers by default if XPM support is enabled
// and call these in your wxApp::OnInit.
// AddHandler(new wxXPMFileHandler); #if wxUSE_XPM_IN_MSW
// AddHandler(new wxXPMDataHandler); AddHandler(new wxXPMFileHandler);
AddHandler(new wxXPMDataHandler);
#endif // wxUSE_XPM_IN_MSW
AddHandler(new wxICOResourceHandler); AddHandler(new wxICOResourceHandler);
AddHandler(new wxICOFileHandler); AddHandler(new wxICOFileHandler);