From f66f0fd7b45f211091ed9d5d301b1fbf5eb6ade0 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Sun, 9 Jan 2000 13:12:28 +0000 Subject: [PATCH] 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 --- src/msw/gdiimage.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 6d9158e4aa..bc4c53ec52 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -39,9 +39,14 @@ #include "wx/msw/dib.h" #include "wx/msw/bitmap.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__ - #include "wx/msw/curico.h" +# include "wx/msw/curico.h" #endif // __WIN16__ // ---------------------------------------------------------------------------- @@ -296,10 +301,12 @@ void wxGDIImage::InitStandardHandlers() AddHandler(new wxBMPResourceHandler); AddHandler(new wxBMPFileHandler); - // Not added by default: include xpmhand.h in your app - // and call these in your wxApp::OnInit. - // AddHandler(new wxXPMFileHandler); - // AddHandler(new wxXPMDataHandler); + // GRG: Add these handlers by default if XPM support is enabled + +#if wxUSE_XPM_IN_MSW + AddHandler(new wxXPMFileHandler); + AddHandler(new wxXPMDataHandler); +#endif // wxUSE_XPM_IN_MSW AddHandler(new wxICOResourceHandler); AddHandler(new wxICOFileHandler);