X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..822e690b221486b63895b5f14a7fbee2bc966fe5:/contrib/src/xrc/xh_radbx.cpp diff --git a/contrib/src/xrc/xh_radbx.cpp b/contrib/src/xrc/xh_radbx.cpp index 244960bd13..5b950e2e93 100644 --- a/contrib/src/xrc/xh_radbx.cpp +++ b/contrib/src/xrc/xh_radbx.cpp @@ -7,7 +7,7 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - + #ifdef __GNUG__ #pragma implementation "xh_radbx.h" #endif @@ -21,11 +21,14 @@ #include "wx/xrc/xh_radbx.h" #include "wx/radiobox.h" +#include "wx/intl.h" #if wxUSE_RADIOBOX -wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() -: wxXmlResourceHandler(), m_insideBox(FALSE) +IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler) + +wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() +: wxXmlResourceHandler(), m_insideBox(false) { XRC_ADD_STYLE(wxRA_SPECIFY_COLS); XRC_ADD_STYLE(wxRA_HORIZONTAL); @@ -35,14 +38,14 @@ wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() } wxObject *wxRadioBoxXmlHandler::DoCreateResource() -{ +{ if( m_class == wxT("wxRadioBox")) { // find the selection long selection = GetLong( wxT("selection"), -1 ); // need to build the list of strings from children - m_insideBox = TRUE; + m_insideBox = true; CreateChildrenPrivately( NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; if( strList.GetCount() > 0 ) @@ -73,7 +76,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() if (strings != NULL) delete[] strings; - strList.Clear(); // dump the strings + strList.Clear(); // dump the strings return control; } @@ -83,7 +86,10 @@ 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; }