X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..29cd57f79b94d31a8216ec533629dbc685c676ea:/src/xrc/xh_combo.cpp diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp index 03fa009eb4..fd3179a66b 100644 --- a/src/xrc/xh_combo.cpp +++ b/src/xrc/xh_combo.cpp @@ -1,16 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// 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$ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_combo.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,42 +15,40 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_COMBOBOX + #include "wx/xrc/xh_combo.h" -#include "wx/combobox.h" -#include "wx/intl.h" -#if wxUSE_COMBOBOX +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/combobox.h" + #include "wx/textctrl.h" // for wxTE_PROCESS_ENTER +#endif IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler) -wxComboBoxXmlHandler::wxComboBoxXmlHandler() -: wxXmlResourceHandler() , m_insideBox(FALSE) +wxComboBoxXmlHandler::wxComboBoxXmlHandler() + :wxXmlResourceHandler() + ,m_insideBox(false) { XRC_ADD_STYLE(wxCB_SIMPLE); XRC_ADD_STYLE(wxCB_SORT); XRC_ADD_STYLE(wxCB_READONLY); XRC_ADD_STYLE(wxCB_DROPDOWN); + XRC_ADD_STYLE(wxTE_PROCESS_ENTER); AddWindowStyles(); } wxObject *wxComboBoxXmlHandler::DoCreateResource() -{ +{ if( m_class == wxT("wxComboBox")) { // find the selection long selection = GetLong( wxT("selection"), -1 ); // need to build the list of strings from children - m_insideBox = TRUE; + 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 +56,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource() GetID(), GetText(wxT("value")), GetPosition(), GetSize(), - strList.GetCount(), - strings, + strList, GetStyle(), wxDefaultValidator, GetName()); @@ -73,9 +66,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource() SetupWindow(control); - if (strings != NULL) - delete[] strings; - strList.Clear(); // dump the strings + strList.Clear(); // dump the strings return control; } @@ -87,7 +78,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; @@ -100,4 +91,4 @@ bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node) (m_insideBox && node->GetName() == wxT("item"))); } -#endif +#endif // wxUSE_XRC && wxUSE_COMBOBOX