X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ea77b4a8bac4ab005bfc592f9cd3262ffa397..d27d59fb91131222207a535b43ef67babfd03ee9:/src/xrc/xh_bmp.cpp diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp index 0853104360..aef57ea0f1 100644 --- a/src/xrc/xh_bmp.cpp +++ b/src/xrc/xh_bmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_bmp.cpp +// Name: src/xrc/xh_bmp.cpp // Purpose: XRC resource for wxBitmap and wxIcon // Author: Vaclav Slavik // Created: 2000/09/09 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "xh_bmp.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,19 +15,24 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_bmp.h" -#include "wx/bitmap.h" + +#ifndef WX_PRECOMP + #include "wx/bitmap.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler) wxBitmapXmlHandler::wxBitmapXmlHandler() -: wxXmlResourceHandler() + :wxXmlResourceHandler() { } wxObject *wxBitmapXmlHandler::DoCreateResource() { - return new wxBitmap(GetBitmap(wxT(""))); + return new wxBitmap(GetBitmap(m_node)); } bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node) @@ -48,10 +49,12 @@ wxIconXmlHandler::wxIconXmlHandler() wxObject *wxIconXmlHandler::DoCreateResource() { - return new wxIcon(GetIcon(wxT(""))); + return new wxIcon(GetIcon(m_node)); } bool wxIconXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxIcon")); } + +#endif // wxUSE_XRC