void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event)
{
// Don't disable the cell if we're just starting to edit it
- if (m_inSetFocus)
+ if ( m_inSetFocus )
+ {
+ event.Skip();
return;
+ }
// accept changes
m_grid->DisableCellEditControl();
- event.Skip();
+ // notice that we must not skip the event here because the call above may
+ // delete the control which received the kill focus event in the first
+ // place and if we pretend not having processed the event, the search for a
+ // handler for it will continue using the now deleted object resulting in a
+ // crash
}
void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
{
bool ctrl = event.ControlDown();
- bool alt = event.AltDown();
+ bool alt;
#ifdef __WXMAC__
// On the Mac the Alt key is more like shift and is used for entry of
// valid characters, so check for Ctrl and Meta instead.
alt = event.MetaDown();
-#endif
+#else // !__WXMAC__
+ alt = event.AltDown();
+#endif // __WXMAC__/!__WXMAC__
// Assume it's not a valid char if ctrl or alt is down, but if both are
// down then it may be because of an AltGr key combination, so let them
return false;
#if wxUSE_UNICODE
- // if the unicode key code is not really a unicode character (it may
- // be a function key or etc., the platforms appear to always give us a
- // small value in this case) then fallback to the ASCII key code but
- // don't do anything for function keys or etc.
- if ( event.GetUnicodeKey() > 127 && event.GetKeyCode() > 127 )
+ if ( static_cast<int>(event.GetUnicodeKey()) == WXK_NONE )
return false;
#else
- if ( event.GetKeyCode() > 255 )
+ if ( event.GetKeyCode() > WXK_START )
return false;
#endif
wxEvtHandler* evtHandler,
long style)
{
- style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER;
+ // Use of wxTE_RICH2 is a strange hack to work around the bug #11681: a
+ // plain text control seems to lose its caret somehow when we hide it and
+ // show it again for a different cell.
+ style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER | wxTE_RICH2;
m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
Text()->SetFocus();
}
-bool wxGridCellTextEditor::EndEdit(const wxString& WXUNUSED(oldval),
+bool wxGridCellTextEditor::EndEdit(int WXUNUSED(row),
+ int WXUNUSED(col),
+ const wxGrid* WXUNUSED(grid),
+ const wxString& WXUNUSED(oldval),
wxString *newval)
{
wxCHECK_MSG( m_control, false,
bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
{
- return wxGridCellEditor::IsAcceptedKey(event);
+ switch ( event.GetKeyCode() )
+ {
+ case WXK_DELETE:
+ case WXK_BACK:
+ return true;
+
+ default:
+ return wxGridCellEditor::IsAcceptedKey(event);
+ }
}
void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
// a valid character, so not a whole lot of testing needs to be done.
wxTextCtrl* tc = Text();
- wxChar ch;
- long pos;
+ int ch;
+
+ bool isPrintable;
#if wxUSE_UNICODE
ch = event.GetUnicodeKey();
- if (ch <= 127)
- ch = (wxChar)event.GetKeyCode();
-#else
- ch = (wxChar)event.GetKeyCode();
-#endif
+ if ( ch != WXK_NONE )
+ isPrintable = true;
+ else
+#endif // wxUSE_UNICODE
+ {
+ ch = event.GetKeyCode();
+ isPrintable = ch >= WXK_SPACE && ch < WXK_START;
+ }
switch (ch)
{
case WXK_DELETE:
- // delete the character at the cursor
- pos = tc->GetInsertionPoint();
- if (pos < tc->GetLastPosition())
- tc->Remove(pos, pos + 1);
+ // Delete the initial character when starting to edit with DELETE.
+ tc->Remove(0, 1);
break;
case WXK_BACK:
- // delete the character before the cursor
- pos = tc->GetInsertionPoint();
- if (pos > 0)
+ // Delete the last character when starting to edit with BACKSPACE.
+ {
+ const long pos = tc->GetLastPosition();
tc->Remove(pos - 1, pos);
+ }
break;
default:
- tc->WriteText(ch);
+ if ( isPrintable )
+ tc->WriteText(static_cast<wxChar>(ch));
break;
}
}
}
else
{
- wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
+ wxLogDebug( wxT("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
}
}
}
wxString sValue = table->GetValue(row, col);
if (! sValue.ToLong(&m_value) && ! sValue.empty())
{
- wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+ wxFAIL_MSG( wxT("this cell doesn't have numeric value") );
return;
}
}
}
}
-bool wxGridCellNumberEditor::EndEdit(const wxString& oldval, wxString *newval)
+bool wxGridCellNumberEditor::EndEdit(int WXUNUSED(row),
+ int WXUNUSED(col),
+ const wxGrid* WXUNUSED(grid),
+ const wxString& oldval, wxString *newval)
{
long value = 0;
wxString text;
else
{
long tmp;
- if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+ if ( params.BeforeFirst(wxT(',')).ToLong(&tmp) )
{
m_min = (int)tmp;
- if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+ if ( params.AfterFirst(wxT(',')).ToLong(&tmp) )
{
m_max = (int)tmp;
}
}
- wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
+ wxLogDebug(wxT("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
}
}
{
if ( !value.ToDouble(&m_value) )
{
- wxFAIL_MSG( _T("this cell doesn't have float value") );
+ wxFAIL_MSG( wxT("this cell doesn't have float value") );
return;
}
}
DoBeginEdit(GetString());
}
-bool wxGridCellFloatEditor::EndEdit(const wxString& oldval, wxString *newval)
+bool wxGridCellFloatEditor::EndEdit(int WXUNUSED(row),
+ int WXUNUSED(col),
+ const wxGrid* WXUNUSED(grid),
+ const wxString& oldval, wxString *newval)
{
const wxString text(Text()->GetValue());
bool is_decimal_point = ( strbuf ==
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
#else
- bool is_decimal_point = ( strbuf == _T(".") );
+ bool is_decimal_point = ( strbuf == wxT(".") );
#endif
if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
else
{
long tmp;
- if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+ if ( params.BeforeFirst(wxT(',')).ToLong(&tmp) )
{
m_width = (int)tmp;
- if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+ if ( params.AfterFirst(wxT(',')).ToLong(&tmp) )
{
m_precision = (int)tmp;
}
}
- wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
+ wxLogDebug(wxT("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
}
}
if ( m_precision == -1 && m_width != -1)
{
// default precision
- fmt.Printf(_T("%%%d.f"), m_width);
+ fmt.Printf(wxT("%%%d.f"), m_width);
}
else if ( m_precision != -1 && m_width == -1)
{
// default width
- fmt.Printf(_T("%%.%df"), m_precision);
+ fmt.Printf(wxT("%%.%df"), m_precision);
}
else if ( m_precision != -1 && m_width != -1 )
{
- fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
+ fmt.Printf(wxT("%%%d.%df"), m_width, m_precision);
}
else
{
// default width/precision
- fmt = _T("%f");
+ fmt = wxT("%f");
}
return wxString::Format(fmt, m_value);
if ( wxGridCellEditor::IsAcceptedKey(event) )
{
const int keycode = event.GetKeyCode();
- if ( isascii(keycode) )
+ if ( wxIsascii(keycode) )
{
- char tmpbuf[2];
- tmpbuf[0] = (char) keycode;
- tmpbuf[1] = '\0';
- wxString strbuf(tmpbuf, *wxConvCurrent);
-
#if wxUSE_INTL
const wxString decimalPoint =
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);
#else
- const wxString decimalPoint(_T('.'));
+ const wxString decimalPoint(wxT('.'));
#endif
// accept digits, 'e' as in '1e+6', also '-', '+', and '.'
// ----------------------------------------------------------------------------
// the default values for GetValue()
-wxString wxGridCellBoolEditor::ms_stringValues[2] = { _T(""), _T("1") };
+wxString wxGridCellBoolEditor::ms_stringValues[2] = { wxT(""), wxT("1") };
void wxGridCellBoolEditor::Create(wxWindow* parent,
wxWindowID id,
// because we'll still overwrite it with something different and
// this risks to be very surprising for the user code, let them
// know about it
- wxFAIL_MSG( _T("invalid value for a cell with bool editor!") );
+ wxFAIL_MSG( wxT("invalid value for a cell with bool editor!") );
}
}
CBox()->SetFocus();
}
-bool wxGridCellBoolEditor::EndEdit(const wxString& WXUNUSED(oldval),
+bool wxGridCellBoolEditor::EndEdit(int WXUNUSED(row),
+ int WXUNUSED(col),
+ const wxGrid* WXUNUSED(grid),
+ const wxString& WXUNUSED(oldval),
wxString *newval)
{
bool value = CBox()->GetValue();
}
}
-bool wxGridCellChoiceEditor::EndEdit(const wxString& WXUNUSED(oldval),
+bool wxGridCellChoiceEditor::EndEdit(int WXUNUSED(row),
+ int WXUNUSED(col),
+ const wxGrid* WXUNUSED(grid),
+ const wxString& WXUNUSED(oldval),
wxString *newval)
{
const wxString value = Combo()->GetValue();
m_choices.Empty();
- wxStringTokenizer tk(params, _T(','));
+ wxStringTokenizer tk(params, wxT(','));
while ( tk.HasMoreTokens() )
{
m_choices.Add(tk.GetNextToken());
}
Combo()->SetSelection(m_index);
- Combo()->SetInsertionPointEnd();
Combo()->SetFocus();
}
-bool wxGridCellEnumEditor::EndEdit(const wxString& WXUNUSED(oldval),
+bool wxGridCellEnumEditor::EndEdit(int WXUNUSED(row),
+ int WXUNUSED(col),
+ const wxGrid* WXUNUSED(grid),
+ const wxString& WXUNUSED(oldval),
wxString *newval)
{
long idx = Combo()->GetSelection();
projects / wxWidgets.git / blobdiff