X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..822e690b221486b63895b5f14a7fbee2bc966fe5:/contrib/src/xrc/xh_stbmp.cpp diff --git a/contrib/src/xrc/xh_stbmp.cpp b/contrib/src/xrc/xh_stbmp.cpp index 034fe3dd68..2674322938 100644 --- a/contrib/src/xrc/xh_stbmp.cpp +++ b/contrib/src/xrc/xh_stbmp.cpp @@ -7,7 +7,7 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - + #ifdef __GNUG__ #pragma implementation "xh_stbmp.h" #endif @@ -22,31 +22,31 @@ #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")); } - -