X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..815f65bd0f673965230ed915d794497a8818dd35:/src/xrc/xh_radbx.cpp diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp index f4fccc5b27..c6ee9307a6 100644 --- a/src/xrc/xh_radbx.cpp +++ b/src/xrc/xh_radbx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_radbx.cpp +// Name: src/xrc/xh_radbx.cpp // Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 @@ -18,8 +18,11 @@ #if wxUSE_XRC && wxUSE_RADIOBOX #include "wx/xrc/xh_radbx.h" -#include "wx/radiobox.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/radiobox.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler) @@ -35,7 +38,7 @@ wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() wxObject *wxRadioBoxXmlHandler::DoCreateResource() { - if( m_class == wxT("wxRadioBox")) + if ( m_class == wxT("wxRadioBox")) { // find the selection long selection = GetLong( wxT("selection"), -1 ); @@ -43,14 +46,6 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() // need to build the list of strings from children m_insideBox = true; CreateChildrenPrivately( NULL, GetParamNode(wxT("content"))); - wxString *strings = (wxString *) NULL; - if( strList.GetCount() > 0 ) - { - strings = new wxString[strList.GetCount()]; - int count = strList.GetCount(); - for( int i = 0; i < count; i++ ) - strings[i]=strList[i]; - } XRC_MAKE_INSTANCE(control, wxRadioBox) @@ -58,8 +53,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() GetID(), GetText(wxT("label")), GetPosition(), GetSize(), - strList.GetCount(), - strings, + m_labels, GetLong(wxT("dimension"), 1), GetStyle(), wxDefaultValidator, @@ -70,22 +64,75 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() SetupWindow(control); - if (strings != NULL) - delete[] strings; - strList.Clear(); // dump the strings + const unsigned count = m_labels.size(); + for( unsigned i = 0; i < count; i++ ) + { +#if wxUSE_TOOLTIPS + if ( !m_tooltips[i].empty() ) + control->SetItemToolTip(i, m_tooltips[i]); +#endif // wxUSE_TOOLTIPS +#if wxUSE_HELP + if ( m_helptextSpecified[i] ) + control->SetItemHelpText(i, m_helptexts[i]); +#endif // wxUSE_HELP + + if ( !m_isShown[i] ) + control->Show(i, false); + if ( !m_isEnabled[i] ) + control->Enable(i, false); + } + + + // forget information about the items of this radiobox, we should start + // afresh for the next one + m_labels.clear(); + +#if wxUSE_TOOLTIPS + m_tooltips.clear(); +#endif // wxUSE_TOOLTIPS + +#if wxUSE_HELP + m_helptexts.clear(); + m_helptextSpecified.clear(); +#endif // wxUSE_HELP + + m_isShown.clear(); + m_isEnabled.clear(); return control; } - else + else // inside the radiobox element { - // on the inside now. - // handle Label + // we handle handle Label constructs here, and the item + // tag can have tooltip, helptext, enabled and hidden attributes + + wxString label = GetNodeContent(m_node); + + wxString tooltip; + m_node->GetAttribute(wxT("tooltip"), &tooltip); + + wxString helptext; + bool hasHelptext = m_node->GetAttribute(wxT("helptext"), &helptext); - // add to the list - wxString str = GetNodeContent(m_node); if (m_resource->GetFlags() & wxXRC_USE_LOCALE) - str = wxGetTranslation(str); - strList.Add(str); + { + label = wxGetTranslation(label, m_resource->GetDomain()); + if ( !tooltip.empty() ) + tooltip = wxGetTranslation(tooltip, m_resource->GetDomain()); + if ( hasHelptext ) + helptext = wxGetTranslation(helptext, m_resource->GetDomain()); + } + + m_labels.push_back(label); +#if wxUSE_TOOLTIPS + m_tooltips.push_back(tooltip); +#endif // wxUSE_TOOLTIPS +#if wxUSE_HELP + m_helptexts.push_back(helptext); + m_helptextSpecified.push_back(hasHelptext); +#endif // wxUSE_HELP + m_isEnabled.push_back(GetBoolAttr("enabled", 1)); + m_isShown.push_back(!GetBoolAttr("hidden", 0)); return NULL; }