X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/621be1ec2672d922cfb95d6e8178b38c8ceaf52a..1789c1c6022a63d0d7bfdf5242528f526b870bc6:/src/xrc/xh_bmp.cpp?ds=inline diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp index ad56a9add2..a91318801b 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" @@ -22,18 +18,23 @@ #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(""))); + // NB: empty parameter name means "take directly from this node's next + // instead of from subnode with given name" + return new wxBitmap(GetBitmap(wxEmptyString)); } bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node) @@ -50,7 +51,9 @@ wxIconXmlHandler::wxIconXmlHandler() wxObject *wxIconXmlHandler::DoCreateResource() { - return new wxIcon(GetIcon(wxT(""))); + // NB: empty parameter name means "take directly from this node's next + // instead of from subnode with given name" + return new wxIcon(GetIcon(wxEmptyString)); } bool wxIconXmlHandler::CanHandle(wxXmlNode *node)