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

Applied and extended patch 886524 (wxGridCellFloatEditor doesn't

Browse Source 
accept '.' and '-').


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-02-08 16:27:22 +00:00
parent 16dd61ac10
commit 60d876f374
2 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/grid.cpp
View File

@@ -41,6 +41,7 @@
#include "wx/checkbox.h"
#include "wx/combobox.h"
#include "wx/valtext.h"
#include "wx/intl.h"
#endif
#include "wx/textfile.h"
@@ -1067,7 +1068,8 @@ void wxGridCellFloatEditor::Reset()
void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
{
int keycode = event.GetKeyCode();
if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.'
if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
|| keycode == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER)[0]
|| keycode == WXK_NUMPAD0
|| keycode == WXK_NUMPAD1
|| keycode == WXK_NUMPAD2
@@ -1167,9 +1169,11 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
return TRUE;
default:
// additionally accept 'e' as in '1e+6'
// additionally accept 'e' as in '1e+6', also '-', '+', and '.'
if ( (keycode < 128) &&
(wxIsdigit(keycode) || tolower(keycode) == 'e') )
(wxIsdigit(keycode) || tolower(keycode) == 'e' ||
keycode == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER)[0] ||
keycode == '+' || keycode == '-') )
return TRUE;
}
}