root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 4.0 nopatch

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento   :


aggiunte xvt_chr_is_digit,  xvt_chr_is_alpha e xvt_chr_is_alnum


git-svn-id: svn://10.65.10.50/trunk@14717 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2007-01-03 16:53:05 +00:00
parent 3ab099bbef
commit 4301d9487b
7 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/controls.cpp
View File

@ -72,7 +72,7 @@ KEY TControl::xiev_to_key(const XI_EVENT* xiev)
if (xiev->v.chr.shift && (k < ' ' || k >= K_UP)) key += K_SHIFT; if (xiev->v.chr.shift && (k < ' ' || k >= K_UP)) key += K_SHIFT;
//if (xiev->v.chr.control && k >= ' ') key += K_CTRL; //if (xiev->v.chr.control && k >= ' ') key += K_CTRL;
// Correzione per gestire i tasti AltGr sulle tastiere non U.S.A. // Correzione per gestire i tasti AltGr sulle tastiere non U.S.A.
if (xiev->v.chr.control && (k > K_SHIFT || (k >= K_F1 && k <= K_F12) || isalnum(k) || strchr("\r+-*/",k) != NULL)) if (xiev->v.chr.control && (k > K_SHIFT || (k >= K_F1 && k <= K_F12) || xvt_chr_is_alnum(k) || strchr("\r+-*/",k) != NULL))
key += K_CTRL; key += K_CTRL;
} }
return key; return key;

2
include/maskfld.cpp
View File

@ -5094,7 +5094,7 @@ bool TZoom_field::on_key( KEY key )
} }
break; break;
default: default:
if (AUTOZOOM && isalnum(key)) if (AUTOZOOM && xvt_chr_is_alnum(key))
{ {
get_window_data(); get_window_data();
if (_str.len() >= size()) if (_str.len() >= size())

2
include/msksheet.cpp
View File

@ -1494,7 +1494,7 @@ bool TSpreadsheet::event_handler(XI_OBJ* itf, XI_EVENT *xiev)
{ {
KEY k = xiev_to_key(xiev); KEY k = xiev_to_key(xiev);
if (isalnum(k)) if (xvt_chr_is_alnum(k))
digit_timer = clock(); digit_timer = clock();
else else
{ {

8
include/printer.h
View File

@ -289,7 +289,7 @@ class TPrinter : public TObject
LINKHANDLER _linkhandler; LINKHANDLER _linkhandler;
// @cmember:(INTERNAL) Caratteri per fincatura // @cmember:(INTERNAL) Caratteri per fincatura
char _fink[11]; TString16 _fink;
// @cmember:(INTERNAL) Flag per aggiungere ad una stampa su file gia' esistente (TRUE aggiunge in coda, FALSE sovrascrive) // @cmember:(INTERNAL) Flag per aggiungere ad una stampa su file gia' esistente (TRUE aggiunge in coda, FALSE sovrascrive)
bool _appendfile; bool _appendfile;
@ -452,11 +452,11 @@ public:
{ return _multiple_link; } { return _multiple_link; }
// @cmember Ritorna i caratteri di fincatura // @cmember Ritorna i caratteri di fincatura
const char* get_fincatura() const char* get_fincatura() const
{ return _fink; } { return (const char *) _fink; }
// @cmember Setta i caratteri di fincatura // @cmember Setta i caratteri di fincatura
void set_fincatura(const char* s) void set_fincatura(const char* s)
{ strncpy(_fink, s, sizeof(_fink)); } { _fink.strncpy(s, 11); }
// @cmember Setta/forza il tipo di fincatura // @cmember Setta/forza il tipo di fincatura
void set_fink_mode(bool f) ; void set_fink_mode(bool f) ;

2
include/xvtility.cpp
View File

@ -246,7 +246,7 @@ KEY e_char_to_key(
key += K_SHIFT; key += K_SHIFT;
//if (ep->v.chr.control && key >= ' ') key += K_CTRL; //if (ep->v.chr.control && key >= ' ') key += K_CTRL;
if (ep->v.chr.control && (key > K_SHIFT || (key >= K_F1 && key <= K_F12) || if (ep->v.chr.control && (key > K_SHIFT || (key >= K_F1 && key <= K_F12) ||
isalnum(key) || strchr("\r+-*/",key) != NULL)) xvt_chr_is_alnum(key) || strchr("\r+-*/",key) != NULL))
key += K_CTRL; key += K_CTRL;
} }
return key; return key;

17
xvaga/xvaga.cpp
View File

@ -885,7 +885,7 @@ void TwxWindow::OnChar(wxKeyEvent& event)
if (event.AltDown()) if (event.AltDown())
{ {
e.v.chr.control = TRUE; e.v.chr.control = TRUE;
if (isalnum(k)) if (xvt_chr_is_alnum(k))
k = toupper(k); k = toupper(k);
else else
{ {
@ -4181,6 +4181,21 @@ double xvt_str_fuzzy_compare (const char* s1, const char* s2)
return fstrcmp(s1, s2); return fstrcmp(s1, s2);
} }
BOOLEAN xvt_chr_is_digit(int c)
{
return (c <= 255) && wxIsdigit(c);
}
BOOLEAN xvt_chr_is_alpha(int c)
{
return (c <= 255) && wxIsalpha(c);
}
BOOLEAN xvt_chr_is_alnum(int c)
{
return (c <= 255) && wxIsalnum(c);
}
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// XVT system calls (added by Guy) // XVT system calls (added by Guy)
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////

5
xvaga/xvt.h
View File

@ -298,6 +298,11 @@ XVTDLL double xvt_str_fuzzy_compare (const char* s1, const char* s2);
XVTDLL void xvt_str_make_upper(char* str); XVTDLL void xvt_str_make_upper(char* str);
XVTDLL void xvt_str_make_lower(char* str); XVTDLL void xvt_str_make_lower(char* str);
XVTDLL BOOLEAN xvt_chr_is_digit(int c);
XVTDLL BOOLEAN xvt_chr_is_alpha(int c);
XVTDLL BOOLEAN xvt_chr_is_alnum(int c);
// System calls by XVAGA // System calls by XVAGA
XVTDLL void xvt_sys_beep(int severity); XVTDLL void xvt_sys_beep(int severity);
XVTDLL long xvt_sys_execute(const char* cmdline, BOOLEAN sync, BOOLEAN iconizetask); XVTDLL long xvt_sys_execute(const char* cmdline, BOOLEAN sync, BOOLEAN iconizetask);