From 49de296d5e9c1d117cf879b05e7c86df5824d02d Mon Sep 17 00:00:00 2001 From: angelo Date: Mon, 29 Jul 1996 17:27:03 +0000 Subject: [PATCH] Coretto errore MI6054. git-svn-id: svn://10.65.10.50/trunk@3286 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4300.cpp | 10 ++++++++-- cg/cg4300.h | 1 + cg/cg4300a.uml | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cg/cg4300.cpp b/cg/cg4300.cpp index c4dce9ced..52be9dabe 100755 --- a/cg/cg4300.cpp +++ b/cg/cg4300.cpp @@ -633,6 +633,13 @@ bool TLiquidazione_app::select_button(TMask_field& f, KEY key) return TRUE; } +bool TLiquidazione_app::reset_button(TMask_field& f, KEY key) +{ + if (key == K_SPACE) + app().reset_choices(f.mask()); + return TRUE; +} + void TLiquidazione_app::reset_choices(TMask& m) { _selected.reset(); @@ -705,6 +712,7 @@ bool TLiquidazione_app::set_liquidazione() m.set_handler(CG43_LST_MESE, lst_tm_handler); m.set_handler(CG43_LST_TRIM, lst_tm_handler); m.set_handler(CG43_BUT_SEL, select_button); + m.set_handler(CG43_BUT_ANN, reset_button); m.field(CG43_FLD_SELECTED).set(format("%ld",_selected.ones())); m.field(CG43_FLD_ANNO).set(_year); @@ -739,8 +747,6 @@ bool TLiquidazione_app::set_liquidazione() // ------------------------------------------------ //m.first_focus(k); - if (k == CG43_BUT_ANN) - reset_choices(m); } while (k != K_ENTER && k != K_ESC); diff --git a/cg/cg4300.h b/cg/cg4300.h index 8d35a174f..6f740a02a 100755 --- a/cg/cg4300.h +++ b/cg/cg4300.h @@ -336,6 +336,7 @@ protected: static bool what_freq_handler(TMask_field& f, KEY key); static bool lst_tm_handler(TMask_field& f, KEY key); static bool select_button(TMask_field& f, KEY key); + static bool reset_button(TMask_field& f, KEY key); static TLiquidazione_app& app() { return (TLiquidazione_app&)main_app(); } diff --git a/cg/cg4300a.uml b/cg/cg4300a.uml index 0008c8a82..610d78689 100755 --- a/cg/cg4300a.uml +++ b/cg/cg4300a.uml @@ -46,8 +46,7 @@ END BUTTON CG43_BUT_ANN 10 BEGIN PROMPT 48 4 "A~zzera" - HELP "Azzerare la selezione delle ditte da fare la liquidazione" - MESSAGE EXIT,CG43_BUT_ANN + HELP "Azzerare la selezione delle ditte da fare la liquidazione" END LIST CG43_LST_MESE 15