X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0966aee3d9eac832fe7dcf66db2eb06e76c51da5..24aab8e81a8627802e4111d9c99a50ece8d0026e:/src/xrc/xh_bmp.cpp diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp index f2c1a15a43..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 ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xh_bmp.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,17 +18,22 @@ #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() { + // NB: empty parameter name means "take directly from this node's next + // instead of from subnode with given name" return new wxBitmap(GetBitmap(wxEmptyString)); } @@ -50,6 +51,8 @@ wxIconXmlHandler::wxIconXmlHandler() wxObject *wxIconXmlHandler::DoCreateResource() { + // NB: empty parameter name means "take directly from this node's next + // instead of from subnode with given name" return new wxIcon(GetIcon(wxEmptyString)); }