X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/xrc/xh_choic.cpp?ds=inline diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp index 4de735f9d2..7aaf0f0bc6 100644 --- a/src/xrc/xh_choic.cpp +++ b/src/xrc/xh_choic.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_choic.cpp +// Name: src/xrc/xh_choic.cpp // Purpose: XRC resource for wxChoice // Author: Bob Mitchell // Created: 2000/03/21 @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_choic.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,57 +15,53 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_CHOICE + #include "wx/xrc/xh_choic.h" -#include "wx/choice.h" -wxChoiceXmlHandler::wxChoiceXmlHandler() -: wxXmlResourceHandler() , m_insideBox(FALSE) +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/choice.h" +#endif + +#include "wx/xml/xml.h" + +IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler) + +wxChoiceXmlHandler::wxChoiceXmlHandler() +: wxXmlResourceHandler() , m_insideBox(false) { - ADD_STYLE(wxCB_SORT); + XRC_ADD_STYLE(wxCB_SORT); AddWindowStyles(); } wxObject *wxChoiceXmlHandler::DoCreateResource() -{ +{ if( m_class == wxT("wxChoice")) { // find the selection - long selection = GetLong( wxT("selection"), -1 ); + long selection = GetLong(wxT("selection"), -1); // 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]; - } - - wxChoice *control = wxStaticCast(m_instance, wxChoice); - - if (!control) - control = new wxChoice; + m_insideBox = true; + CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); + + XRC_MAKE_INSTANCE(control, wxChoice) control->Create(m_parentAsWindow, GetID(), GetPosition(), GetSize(), - strList.GetCount(), - strings, + strList, GetStyle(), wxDefaultValidator, GetName()); - if( selection != -1 ) - control->SetSelection( selection ); + if (selection != -1) + control->SetSelection(selection); SetupWindow(control); - if( strings != NULL ) - delete [] strings; - strList.Clear(); // dump the strings + strList.Clear(); // dump the strings return control; } @@ -77,22 +69,21 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() { // on the inside now. // handle <item>Label</item> - + // add to the list - strList.Add( GetNodeContent(m_node) ); + wxString str = GetNodeContent(m_node); + if (m_resource->GetFlags() & wxXRC_USE_LOCALE) + str = wxGetTranslation(str, m_resource->GetDomain()); + strList.Add(str); return NULL; } - } - - bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) { return (IsOfClass(node, wxT("wxChoice")) || - (m_insideBox && node->GetName() == wxT("item")) - ); + (m_insideBox && node->GetName() == wxT("item"))); } - +#endif // wxUSE_XRC && wxUSE_CHOICE