X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/xrc/xh_bttn.cpp?ds=inline diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp index ff2d4813d0..7f2058cdd2 100644 --- a/src/xrc/xh_bttn.cpp +++ b/src/xrc/xh_bttn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_bttn.cpp +// Name: src/xrc/xh_bttn.cpp // Purpose: XRC resource for buttons // Author: Vaclav Slavik // Created: 2000/03/05 @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_bttn.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,22 +15,29 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_BUTTON + #include "wx/xrc/xh_bttn.h" -#include "wx/button.h" +#ifndef WX_PRECOMP + #include "wx/button.h" +#endif -wxButtonXmlHandler::wxButtonXmlHandler() -: wxXmlResourceHandler() +IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler) + +wxButtonXmlHandler::wxButtonXmlHandler() +: wxXmlResourceHandler() { XRC_ADD_STYLE(wxBU_LEFT); XRC_ADD_STYLE(wxBU_RIGHT); XRC_ADD_STYLE(wxBU_TOP); XRC_ADD_STYLE(wxBU_BOTTOM); + XRC_ADD_STYLE(wxBU_EXACTFIT); AddWindowStyles(); } wxObject *wxButtonXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(button, wxButton) button->Create(m_parentAsWindow, @@ -47,8 +50,15 @@ wxObject *wxButtonXmlHandler::DoCreateResource() if (GetBool(wxT("default"), 0)) button->SetDefault(); + + if ( GetParamNode("bitmap") ) + { + button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON), + GetDirection("bitmapposition")); + } + SetupWindow(button); - + return button; } @@ -56,3 +66,5 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxButton")); } + +#endif // wxUSE_XRC && wxUSE_BUTTON