X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/xrc/xh_bmp.cpp diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp index 57d7985107..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 @@ -18,18 +18,21 @@ #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(wxEmptyString)); + return new wxBitmap(GetBitmap(m_node)); } bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node) @@ -46,7 +49,7 @@ wxIconXmlHandler::wxIconXmlHandler() wxObject *wxIconXmlHandler::DoCreateResource() { - return new wxIcon(GetIcon(wxEmptyString)); + return new wxIcon(GetIcon(m_node)); } bool wxIconXmlHandler::CanHandle(wxXmlNode *node)