Modificata leggermente remove

git-svn-id: svn://10.65.10.50/trunk@332 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-10-07 14:59:11 +00:00
parent cb50be4f71
commit 4d82a68be4
3 changed files with 15 additions and 7 deletions

View File

@ -1 +1 @@
#define VERSION 1.8
#define VERSION 1.9

View File

@ -1,4 +1,4 @@
// $Id: relapp.cpp,v 1.12 1994-10-03 08:47:24 guy Exp $
// $Id: relapp.cpp,v 1.13 1994-10-07 14:59:09 guy Exp $
#include <mailbox.h>
#include <sheet.h>
#include <urldefid.h>
@ -642,7 +642,7 @@ int TRelation_application::rewrite(const TMask& m)
}
bool TRelation_application::remove()
bool TRelation_application::relation_remove()
{
CHECK(_mask->mode() == MODE_MOD, "You can call remove in MODE_MOD only");
TRelation *r = get_relation();
@ -655,16 +655,23 @@ bool TRelation_application::remove()
if (yesno_box("Confermare l'eliminazione"))
{
r->restore_status();
const int err = r->remove();
if (err == NOERR)
const bool ok = remove();
if (ok)
set_limits();
else
return error_box("Errore di cancellazione");
return error_box("Errore di cancellazione %d", r->status());
}
return TRUE;
}
bool TRelation_application::remove()
{
const int err = get_relation()->remove();
return err == NOERR;
}
bool TRelation_application::main_loop()
{
long recins = -1;
@ -733,7 +740,7 @@ bool TRelation_application::main_loop()
break;
case K_DEL:
{
if (remove())
if (relation_remove())
query_mode();
}
break;

View File

@ -40,6 +40,7 @@ class TRelation_application : public TApplication
void query_insert_mode() { query_mode(TRUE); }
void insert_mode(); // Entra in modo inserimento
virtual bool main_loop(); // Ciclo principale
bool relation_remove(); // Cancella il record corrente
TMask_field* get_search_field() const;
bool autonum(TMask* m, bool rec);