projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix history in wxWebViewIE when using a custom file scheme.
[wxWidgets.git]
/
src
/
xrc
/
xh_combo.cpp
diff --git
a/src/xrc/xh_combo.cpp
b/src/xrc/xh_combo.cpp
index c7a2e255eb3b7379041ced1fb8bafc12cc42aa10..fd3179a66b97c265c6c805bc79eff50eece77f91 100644
(file)
--- a/
src/xrc/xh_combo.cpp
+++ b/
src/xrc/xh_combo.cpp
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
// Name: src/xrc/xh_combo.cpp
/////////////////////////////////////////////////////////////////////////////
// Name: src/xrc/xh_combo.cpp
-// Purpose: XRC resource for wx
Radi
oBox
+// Purpose: XRC resource for wx
Comb
oBox
// Author: Bob Mitchell
// Created: 2000/03/21
// RCS-ID: $Id$
// Author: Bob Mitchell
// Created: 2000/03/21
// RCS-ID: $Id$
@@
-21,19
+21,21
@@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/combobox.h"
+ #include "wx/textctrl.h" // for wxTE_PROCESS_ENTER
#endif
#endif
-#include "wx/combobox.h"
-
IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
wxComboBoxXmlHandler::wxComboBoxXmlHandler()
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);
XRC_ADD_STYLE(wxCB_READONLY);
XRC_ADD_STYLE(wxCB_DROPDOWN);
{
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();
}
AddWindowStyles();
}
@@
-47,14
+49,6
@@
wxObject *wxComboBoxXmlHandler::DoCreateResource()
// need to build the list of strings from children
m_insideBox = true;
CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
// 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)
XRC_MAKE_INSTANCE(control, wxComboBox)
@@
-62,8
+56,7
@@
wxObject *wxComboBoxXmlHandler::DoCreateResource()
GetID(),
GetText(wxT("value")),
GetPosition(), GetSize(),
GetID(),
GetText(wxT("value")),
GetPosition(), GetSize(),
- strList.GetCount(),
- strings,
+ strList,
GetStyle(),
wxDefaultValidator,
GetName());
GetStyle(),
wxDefaultValidator,
GetName());
@@
-73,8
+66,6
@@
wxObject *wxComboBoxXmlHandler::DoCreateResource()
SetupWindow(control);
SetupWindow(control);
- if (strings != NULL)
- delete[] strings;
strList.Clear(); // dump the strings
return control;
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)
// 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;
strList.Add(str);
return NULL;