X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78d14f80e9a72041ede52c30d912ec5cef21b1b3..31478355f8348d7dfb1c647919b62b224acfa8a0:/contrib/src/xrc/xh_radbx.cpp diff --git a/contrib/src/xrc/xh_radbx.cpp b/contrib/src/xrc/xh_radbx.cpp index 7d22430aa4..0bff4dda51 100644 --- a/contrib/src/xrc/xh_radbx.cpp +++ b/contrib/src/xrc/xh_radbx.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_radbx.cpp -// Purpose: XML resource for wxRadioBox +// Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ @@ -21,16 +21,19 @@ #include "wx/xrc/xh_radbx.h" #include "wx/radiobox.h" +#include "wx/intl.h" #if wxUSE_RADIOBOX +IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler) + wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() -: wxXmlResourceHandler() , m_insideBox(FALSE) +: wxXmlResourceHandler(), m_insideBox(FALSE) { - ADD_STYLE(wxRA_SPECIFY_COLS); - ADD_STYLE(wxRA_HORIZONTAL); - ADD_STYLE(wxRA_SPECIFY_ROWS); - ADD_STYLE(wxRA_VERTICAL); + XRC_ADD_STYLE(wxRA_SPECIFY_COLS); + XRC_ADD_STYLE(wxRA_HORIZONTAL); + XRC_ADD_STYLE(wxRA_SPECIFY_ROWS); + XRC_ADD_STYLE(wxRA_VERTICAL); AddWindowStyles(); } @@ -53,26 +56,26 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() strings[i]=strList[i]; } + XRC_MAKE_INSTANCE(control, wxRadioBox) - wxRadioBox *control = new wxRadioBox(m_parentAsWindow, - GetID(), - GetText(wxT("label")), - GetPosition(), GetSize(), - strList.GetCount(), - strings, - GetLong( wxT("dimension"), 1 ), - GetStyle(), - wxDefaultValidator, - GetName() - ); + control->Create(m_parentAsWindow, + GetID(), + GetText(wxT("label")), + GetPosition(), GetSize(), + strList.GetCount(), + strings, + GetLong(wxT("dimension"), 1), + GetStyle(), + wxDefaultValidator, + GetName()); - if( selection != -1 ) - control->SetSelection( selection ); + if (selection != -1) + control->SetSelection(selection); SetupWindow(control); - if( strings != NULL ) - delete [] strings; + if (strings != NULL) + delete[] strings; strList.Clear(); // dump the strings return control; @@ -83,20 +86,20 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() // handle Label // add to the list - strList.Add( GetNodeContent(m_node) ); + wxString str = GetNodeContent(m_node); + if (m_resource->GetFlags() & wxXRC_USE_LOCALE) + str = wxGetTranslation(str); + strList.Add(str); return NULL; } } - - bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node) { return (IsOfClass(node, wxT("wxRadioBox")) || - (m_insideBox && node->GetName() == wxT("item")) - ); + (m_insideBox && node->GetName() == wxT("item"))); } #endif