X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c575e45a24711793f98959a1f394a9e528c3129a..68ca12fef650ce4622e05ba4eb21a7aa23849107:/src/xrc/xh_listb.cpp diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp index a94406affb..fb92aeae16 100644 --- a/src/xrc/xh_listb.cpp +++ b/src/xrc/xh_listb.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_listb.cpp +// Name: src/xrc/xh_listb.cpp // Purpose: XRC resource for wxListBox // Author: Bob Mitchell & Vaclav Slavik // Created: 2000/07/29 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xh_listb.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,16 +15,20 @@ #pragma hdrstop #endif -#if wxUSE_XRC +#if wxUSE_XRC && wxUSE_LISTBOX #include "wx/xrc/xh_listb.h" -#include "wx/listbox.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/listbox.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler) wxListBoxXmlHandler::wxListBoxXmlHandler() -: wxXmlResourceHandler() , m_insideBox(false) + : wxXmlResourceHandler(), + m_insideBox(false) { XRC_ADD_STYLE(wxLB_SINGLE); XRC_ADD_STYLE(wxLB_MULTIPLE); @@ -42,7 +42,7 @@ wxListBoxXmlHandler::wxListBoxXmlHandler() wxObject *wxListBoxXmlHandler::DoCreateResource() { - if( m_class == wxT("wxListBox")) + if ( m_class == wxT("wxListBox")) { // find the selection long selection = GetLong(wxT("selection"), -1); @@ -50,22 +50,14 @@ wxObject *wxListBoxXmlHandler::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]; - } + m_insideBox = false; XRC_MAKE_INSTANCE(control, wxListBox) control->Create(m_parentAsWindow, GetID(), GetPosition(), GetSize(), - strList.GetCount(), - strings, + strList, GetStyle(), wxDefaultValidator, GetName()); @@ -74,9 +66,6 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() control->SetSelection(selection); SetupWindow(control); - - if (strings != NULL) - delete[] strings; strList.Clear(); // dump the strings return control; @@ -89,7 +78,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() // add to the list wxString str = GetNodeContent(m_node); if (m_resource->GetFlags() & wxXRC_USE_LOCALE) - str = wxGetTranslation(str); + str = wxGetTranslation(str, m_resource->GetDomain()); strList.Add(str); return NULL; @@ -102,4 +91,4 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node) (m_insideBox && node->GetName() == wxT("item"))); } -#endif // wxUSE_XRC +#endif // wxUSE_XRC && wxUSE_LISTBOX