X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c575e45a24711793f98959a1f394a9e528c3129a..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/xrc/xh_combo.cpp diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp index 837633de09..da2040909c 100644 --- a/src/xrc/xh_combo.cpp +++ b/src/xrc/xh_combo.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_combo.cpp -// Purpose: XRC resource for wxRadioBox +// Name: src/xrc/xh_combo.cpp +// Purpose: XRC resource for wxComboBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xh_combo.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,13 +18,17 @@ #if wxUSE_XRC && wxUSE_COMBOBOX #include "wx/xrc/xh_combo.h" -#include "wx/combobox.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/combobox.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler) wxComboBoxXmlHandler::wxComboBoxXmlHandler() -: wxXmlResourceHandler() , m_insideBox(false) + :wxXmlResourceHandler() + ,m_insideBox(false) { XRC_ADD_STYLE(wxCB_SIMPLE); XRC_ADD_STYLE(wxCB_SORT); @@ -47,14 +47,6 @@ wxObject *wxComboBoxXmlHandler::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, wxComboBox) @@ -62,8 +54,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource() GetID(), GetText(wxT("value")), GetPosition(), GetSize(), - strList.GetCount(), - strings, + strList, GetStyle(), wxDefaultValidator, GetName()); @@ -73,8 +64,6 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource() SetupWindow(control); - if (strings != NULL) - delete[] strings; strList.Clear(); // dump the strings return control; @@ -87,7 +76,7 @@ wxObject *wxComboBoxXmlHandler::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;