X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..815f65bd0f673965230ed915d794497a8818dd35:/src/xrc/xh_bttn.cpp diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp index d2c48b42a7..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,27 +15,30 @@ #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 + +IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler) -wxButtonXmlHandler::wxButtonXmlHandler() -: wxXmlResourceHandler() +wxButtonXmlHandler::wxButtonXmlHandler() +: wxXmlResourceHandler() { - ADD_STYLE(wxBU_LEFT); - ADD_STYLE(wxBU_RIGHT); - ADD_STYLE(wxBU_TOP); - ADD_STYLE(wxBU_BOTTOM); + 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() -{ - wxButton *button = wxStaticCast(m_instance, wxButton); - - if (!button) - button = new wxButton; +{ + XRC_MAKE_INSTANCE(button, wxButton) button->Create(m_parentAsWindow, GetID(), @@ -49,17 +48,23 @@ wxObject *wxButtonXmlHandler::DoCreateResource() wxDefaultValidator, GetName()); - if (GetBool(wxT("default"), 0) == 1) button->SetDefault(); + if (GetBool(wxT("default"), 0)) + button->SetDefault(); + + if ( GetParamNode("bitmap") ) + { + button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON), + GetDirection("bitmapposition")); + } + SetupWindow(button); - + return button; } - - bool wxButtonXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxButton")); } - +#endif // wxUSE_XRC && wxUSE_BUTTON