X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78d14f80e9a72041ede52c30d912ec5cef21b1b3..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/xrc/xh_stbmp.cpp?ds=inline diff --git a/src/xrc/xh_stbmp.cpp b/src/xrc/xh_stbmp.cpp index 49371752a4..8bd4bb2094 100644 --- a/src/xrc/xh_stbmp.cpp +++ b/src/xrc/xh_stbmp.cpp @@ -1,14 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_stbmp.cpp -// Purpose: XML resource for wxStaticBitmap +// Purpose: XRC resource for wxStaticBitmap // Author: Vaclav Slavik // Created: 2000/04/22 // RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_stbmp.h" #endif @@ -19,34 +19,38 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_stbmp.h" #include "wx/statbmp.h" -wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler() -: wxXmlResourceHandler() +IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmapXmlHandler, wxXmlResourceHandler) + +wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler() +: wxXmlResourceHandler() { AddWindowStyles(); } wxObject *wxStaticBitmapXmlHandler::DoCreateResource() -{ - wxStaticBitmap *bmp = new wxStaticBitmap(m_parentAsWindow, - GetID(), - GetBitmap(wxT("bitmap"), GetSize()), - GetPosition(), GetSize(), - GetStyle(), - GetName() - ); +{ + XRC_MAKE_INSTANCE(bmp, wxStaticBitmap) + + bmp->Create(m_parentAsWindow, + GetID(), + GetBitmap(wxT("bitmap"), wxART_OTHER, GetSize()), + GetPosition(), GetSize(), + GetStyle(), + GetName()); + SetupWindow(bmp); - + return bmp; } - - bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxStaticBitmap")); } - +#endif // wxUSE_XRC