errore MI0772

git-svn-id: svn://10.65.10.50/trunk@1503 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1995-06-26 16:51:48 +00:00
parent b01aa15cbe
commit e3ae807075

View File

@ -1,4 +1,4 @@
// $Id: relapp.cpp,v 1.60 1995-06-23 14:51:14 guy Exp $ // $Id: relapp.cpp,v 1.61 1995-06-26 16:51:48 alex Exp $
#include <mailbox.h> #include <mailbox.h>
#include <sheet.h> #include <sheet.h>
#include <urldefid.h> #include <urldefid.h>
@ -602,9 +602,13 @@ bool TRelation_application::save(bool check_dirty)
if (errore) if (errore)
{ {
if (annulla) if (annulla)
{ {
k = yesno_box("Campo inconsistente: annullare?") ? K_NO : K_ESC; TString w(_mask->field(dirty).warning());
if (k == K_ESC) _mask->first_focus(-_mask->field(dirty).dlg());
if (w.empty())
w = "Campo inconsistente";
k = yesno_box("%s: annullare?", (const char *) w) ? K_ESC : K_NO;
if (k == K_NO) _mask->first_focus(-_mask->field(dirty).dlg());
} }
else k = K_ESC; else k = K_ESC;
} }
@ -619,7 +623,7 @@ bool TRelation_application::save(bool check_dirty)
get_relation()->lfile().reread(_unlock); // Unlock main file get_relation()->lfile().reread(_unlock); // Unlock main file
} }
was_dirty = FALSE; was_dirty = FALSE;
return TRUE; return k == K_ESC;
} }
if (annulla) if (annulla)