X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78d14f80e9a72041ede52c30d912ec5cef21b1b3..d1a6e2b7a103d761fbc15e0e9c1c20ab53a849d9:/contrib/src/xrc/xh_listb.cpp diff --git a/contrib/src/xrc/xh_listb.cpp b/contrib/src/xrc/xh_listb.cpp index 4cc771e16c..68caf3c1b8 100644 --- a/contrib/src/xrc/xh_listb.cpp +++ b/contrib/src/xrc/xh_listb.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_listb.cpp -// Purpose: XML resource for wxListBox +// Purpose: XRC resource for wxListBox // Author: Bob Mitchell & Vaclav Slavik // Created: 2000/07/29 // RCS-ID: $Id$ @@ -21,17 +21,20 @@ #include "wx/xrc/xh_listb.h" #include "wx/listbox.h" +#include "wx/intl.h" + +IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler) wxListBoxXmlHandler::wxListBoxXmlHandler() : wxXmlResourceHandler() , m_insideBox(FALSE) { - ADD_STYLE(wxLB_SINGLE); - ADD_STYLE(wxLB_MULTIPLE); - ADD_STYLE(wxLB_EXTENDED); - ADD_STYLE(wxLB_HSCROLL); - ADD_STYLE(wxLB_ALWAYS_SB); - ADD_STYLE(wxLB_NEEDED_SB); - ADD_STYLE(wxLB_SORT); + XRC_ADD_STYLE(wxLB_SINGLE); + XRC_ADD_STYLE(wxLB_MULTIPLE); + XRC_ADD_STYLE(wxLB_EXTENDED); + XRC_ADD_STYLE(wxLB_HSCROLL); + XRC_ADD_STYLE(wxLB_ALWAYS_SB); + XRC_ADD_STYLE(wxLB_NEEDED_SB); + XRC_ADD_STYLE(wxLB_SORT); AddWindowStyles(); } @@ -40,38 +43,38 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() if( m_class == wxT("wxListBox")) { // 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"))); + CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; - if( strList.GetCount() > 0 ) + if (strList.GetCount() > 0) { strings = new wxString[strList.GetCount()]; int count = strList.GetCount(); - for( int i = 0; i < count; i++ ) + for (int i = 0; i < count; i++) strings[i]=strList[i]; } + XRC_MAKE_INSTANCE(control, wxListBox) - wxListBox *control = new wxListBox(m_parentAsWindow, - GetID(), - GetPosition(), GetSize(), - strList.GetCount(), - strings, - GetStyle(), - wxDefaultValidator, - GetName() - ); + control->Create(m_parentAsWindow, + GetID(), + GetPosition(), GetSize(), + strList.GetCount(), + strings, + 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; @@ -82,20 +85,17 @@ wxObject *wxListBoxXmlHandler::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 wxListBoxXmlHandler::CanHandle(wxXmlNode *node) { return (IsOfClass(node, wxT("wxListBox")) || - (m_insideBox && node->GetName() == wxT("item")) - ); + (m_insideBox && node->GetName() == wxT("item"))); } - -