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

controls.cpp Evitato il cambio del focus nei bottoni Fine ed Annulla

Browse Source 
maskfld.h       Corretti commenti errati
msksheet.cpp    Potenziato il metodo set_back_and_fore_colors


git-svn-id: svn://10.65.10.50/trunk@4375 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-05-22 14:16:28 +00:00
parent a07348f10e
commit f83915d3a7
3 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/controls.cpp
View File

@ -1324,18 +1324,24 @@ bool TButton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
if (xiev->type == XIE_BUTTON) if (xiev->type == XIE_BUTTON)
{ {
if (_last_mouse_button == 0 && xi_move_focus(_obj)) if (_last_mouse_button == 0)
{ {
switch (_obj->v.btn->type) if (id() != DLG_CANCEL && id() != DLG_QUIT)
ok = xi_move_focus(_obj) ? TRUE : FALSE;
if (ok)
{ {
case XIBT_CHECKBOX: switch (_obj->v.btn->type)
case XIBT_BUTTON_CHECKBOX: {
toggle(); case XIBT_CHECKBOX:
break; case XIBT_BUTTON_CHECKBOX:
default: toggle();
break; break;
default:
break;
}
ok = notify_key(K_SPACE);
} }
ok = notify_key(K_SPACE);
} }
} }
else else

4
include/maskfld.h
View File

@ -789,9 +789,9 @@ class TBrowse : public TBrowse_button
// @cmember:(INTERNAL) Indica se sul campo e' gia' stato effettuato il check // @cmember:(INTERNAL) Indica se sul campo e' gia' stato effettuato il check
bool _checked; bool _checked;
// @cmember:(INTERNAL) Testata della maschera di ricerca // @cmember:(INTERNAL) Testate della maschera di ricerca
TToken_string _head; TToken_string _head;
// @cmember:(INTERNAL) Item della maschera di ricerca // @cmember:(INTERNAL) Campi visualizzati dalla maschera di ricerca
TToken_string _items; TToken_string _items;
// @cmember:(INTERNAL) Campi di input sulla maschera // @cmember:(INTERNAL) Campi di input sulla maschera
TToken_string _inp_id; TToken_string _inp_id;

29
include/msksheet.cpp
View File

@ -705,7 +705,7 @@ int TSpreadsheet::insert(
TToken_string* toktok = new TToken_string(80); TToken_string* toktok = new TToken_string(80);
r = _str.insert(toktok, rec); r = _str.insert(toktok, rec);
_property.insert(NULL, r); _property.insert(NULL, r, TRUE); // Crea lo spazio necessario per le proprieta'
// Notifica che l'inserimento e' terminato // Notifica che l'inserimento e' terminato
owner().post_insert(r); owner().post_insert(r);
@ -1668,12 +1668,27 @@ void TSpreadsheet::enable_cell(
} }
void TSpreadsheet::set_back_and_fore_color(COLOR back, COLOR fore, int row) void TSpreadsheet::set_back_and_fore_color(COLOR back, COLOR fore, int row)
{ {
TRow_property* prop = get_property(row, TRUE); if (back != COLOR_INVALID || fore != COLOR_INVALID)
if (back != COLOR_INVALID) {
prop->_back = back; int first = 0;
if (fore != COLOR_INVALID) int last = items()-1;
prop->_fore = fore; if (row > 0)
first = last = row;
const bool crea = back != NORMAL_BACK_COLOR || fore != NORMAL_COLOR;
for (int r = first; r <= last; r++)
{
TRow_property* prop = get_property(r, crea);
if (prop)
{
if (back != COLOR_INVALID)
prop->_back = back;
if (fore != COLOR_INVALID)
prop->_fore = fore;
}
}
}
} }
void TSpreadsheet::get_back_and_fore_color(COLOR& back, COLOR& fore, int row) void TSpreadsheet::get_back_and_fore_color(COLOR& back, COLOR& fore, int row)