Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract setting max length in wxGridCellTextEditor::DoCreate() and call it from wxGridCellAutoWrapStringEditor::Create() to ensure that it honours the base editor parameters

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-01 22:05:12 +00:00
parent 1cd5e95c1c
commit 1d5fda5dc6
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/grid.h
View File

@@ -423,6 +423,8 @@ protected:
wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; } wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; }
// parts of our virtual functions reused by the derived classes // parts of our virtual functions reused by the derived classes
void DoCreate(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler,
long style = 0);
void DoBeginEdit(const wxString& startValue); void DoBeginEdit(const wxString& startValue);
void DoReset(const wxString& startValue); void DoReset(const wxString& startValue);

28
src/generic/grid.cpp
View File

@@ -642,21 +642,29 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
wxWindowID id, wxWindowID id,
wxEvtHandler* evtHandler) wxEvtHandler* evtHandler)
{ {
m_control = new wxTextCtrl(parent, id, wxEmptyString, DoCreate(parent, id, evtHandler);
wxDefaultPosition, wxDefaultSize }
void wxGridCellTextEditor::DoCreate(wxWindow* parent,
wxWindowID id,
wxEvtHandler* evtHandler,
long style)
{
#if defined(__WXMSW__) #if defined(__WXMSW__)
, style |= wxTE_PROCESS_ENTER |
wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB |
wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL |
wxTE_AUTO_SCROLL | wxNO_BORDER;
wxNO_BORDER
#endif #endif
);
m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
style);
// set max length allowed in the textctrl, if the parameter was set // set max length allowed in the textctrl, if the parameter was set
if (m_maxChars != 0) if ( m_maxChars != 0 )
{ {
((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars); Text()->SetMaxLength(m_maxChars);
} }
wxGridCellEditor::Create(parent, id, evtHandler); wxGridCellEditor::Create(parent, id, evtHandler);

8
src/generic/gridctrl.cpp
View File

@@ -292,12 +292,8 @@ wxGridCellAutoWrapStringEditor::Create(wxWindow* parent,
wxWindowID id, wxWindowID id,
wxEvtHandler* evtHandler) wxEvtHandler* evtHandler)
{ {
m_control = new wxTextCtrl(parent, id, wxEmptyString, wxGridCellTextEditor::DoCreate(parent, id, evtHandler,
wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_RICH);
wxTE_MULTILINE | wxTE_RICH);
wxGridCellEditor::Create(parent, id, evtHandler);
} }
void void