Corretta testfocuschange sheet e test dell'esc delle relapp

git-svn-id: svn://10.65.10.50/trunk@929 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-01-27 18:00:47 +00:00
parent 93e06dc260
commit 1a1ba5b76a
7 changed files with 1395 additions and 1389 deletions

View File

@ -93,8 +93,12 @@ void TConfig::_write_file()
if (!done) _write_paragraph(out);
out.close(); in.close();
TFilename bak(_file); bak.ext("bak");
rename(_file, bak);
if (_file[0] > 'B' || _file[1] != ':') // Non creare il .bak su dischetto
{
TFilename bak(_file); bak.ext("bak");
rename(_file, bak);
}
fcopy(temp, _file); // Copia dalla tempdir al nuovo .ini
remove(temp); // Cancella file temporaneo
}

File diff suppressed because it is too large Load Diff

View File

@ -52,7 +52,7 @@ class TMask : public TWindow
real _exchange; // Current value exhange
bool _sheetmask; // Mask owned by a sheet
long _total_time, _build_time, _skip_time;
long _total_time, _build_time, _init_time;
protected:
// Ritorna la finestra della pagina corrente (Usare con attenzione)
@ -170,8 +170,8 @@ public:
void reset(short fld_id = -1);
void undo(short fld_id = -1);
void autoload(const TRelation* = NULL);
void autosave(TRelation* = NULL) const;
void autoload(const TRelation*);
void autosave(TRelation*) const;
void send_key(KEY key, short id, TMask_field* from = NULL);
void set_handler(short fld_id, CONTROL_HANDLER handler);

View File

@ -414,6 +414,7 @@ bool TSpreadsheet::destroy(int rec)
{
_disabled.destroy();
_str.destroy();
set_dirty(_row_dirty = FALSE);
}
else
{
@ -456,7 +457,7 @@ bool TSpreadsheet::test_focus_change()
{
bool ok = dirty() != 3;
if (ok && _row_dirty)
{
{
str2mask(selected());
ok = sheet_mask().check_fields();
}

View File

@ -1 +1 @@
#define VERSION 1.4
#define VERSION 1.5

View File

@ -126,6 +126,7 @@ void TPrefix::set(const char* name, bool force, TFilelock mode)
CCloseDir(COMDIR);
CCloseRecDir(NORDIR);
CCloseRecDir(COMDIR);
_prefix = ".";
return;
}

View File

@ -1,4 +1,4 @@
// $Id: relapp.cpp,v 1.47 1995-01-26 13:57:48 guy Exp $
// $Id: relapp.cpp,v 1.48 1995-01-27 18:00:47 guy Exp $
#include <mailbox.h>
#include <sheet.h>
#include <urldefid.h>
@ -597,7 +597,7 @@ bool TRelation_application::save(bool check_dirty)
if (annulla)
{
k = yesno_box("Campo inconsistente: annullare?") ? K_NO : K_ESC;
if (k == K_NO) _mask->first_focus(-_mask->field(dirty).dlg());
if (k == K_ESC) _mask->first_focus(-_mask->field(dirty).dlg());
}
else k = K_ESC;
}