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

Risolti conflitti

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@665 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-11-18 17:01:28 +00:00
parent 5acff4f45b
commit 490182303a
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/relapp.cpp
View File

@ -1,4 +1,4 @@
// $Id: relapp.cpp,v 1.32 1994-11-18 16:49:47 guy Exp $ // $Id: relapp.cpp,v 1.33 1994-11-18 17:01:23 guy Exp $
#include <mailbox.h> #include <mailbox.h>
#include <sheet.h> #include <sheet.h>
#include <urldefid.h> #include <urldefid.h>
@ -711,7 +711,7 @@ bool TRelation_application::main_loop()
enable_menu_item(M_FILE_NEW, _mask->query_mode()); enable_menu_item(M_FILE_NEW, _mask->query_mode());
// Dis/abilita cambio parametri // Dis/abilita cambio parametri
enable_menu_item(M_FILE_REVERT, _mask->qury_mode()); enable_menu_item(M_FILE_REVERT, _mask->query_mode());
k = _mask->run(); k = _mask->run();

11
include/relation.cpp
View File

@ -1,4 +1,4 @@
// $Id: relation.cpp,v 1.23 1994-11-18 16:49:49 guy Exp $ // $Id: relation.cpp,v 1.24 1994-11-18 17:01:26 guy Exp $
// relation.cpp // relation.cpp
// fv 12/8/93 // fv 12/8/93
// relation class for isam files // relation class for isam files
@ -50,7 +50,8 @@ public:
int num() const { return _num; } int num() const { return _num; }
int link() const { return _numto; } int link() const { return _numto; }
byte alias() const { return _alias; } byte alias() const { return _alias; }
bool& write_enable() { return _write_enable; } bool write_enable() const { return _write_enable; }
void write_enable(bool we) { _write_enable = we; }
TRectype& load_rec(TRectype& r, const TBaseisamfile& from) const; TRectype& load_rec(TRectype& r, const TBaseisamfile& from) const;
TRelationdef(const TRelation* rel, int file, byte key, TRelationdef(const TRelation* rel, int file, byte key,
@ -274,13 +275,13 @@ void TRelation::write_enable(int logicnum, const bool on)
if (logicnum == - 1) if (logicnum == - 1)
{ {
for (int i = 0; i < _reldefs.items(); i++) for (int i = 0; i < _reldefs.items(); i++)
reldef(i).write_enable() = on; reldef(i).write_enable(on);
} }
else else
{ {
const int idx = log2ind(logicnum); const int idx = log2ind(logicnum);
CHECKD(idx != NOTFOUND, "File not found n. ", logicnum); CHECKD(idx != NOTFOUND, "File not found n. ", logicnum);
reldef(idx).write_enable() = on; reldef(idx).write_enable(on);
} }
} }
@ -289,7 +290,7 @@ void TRelation::write_enable(const char* name, const bool on)
{ {
const int idx = name2ind(name); const int idx = name2ind(name);
CHECKS(idx != NOTFOUND, "File or Table not found:", name); CHECKS(idx != NOTFOUND, "File or Table not found:", name);
reldef(idx).write_enable() = on; reldef(idx).write_enable(on);
} }
bool TRelation::add(int logicnum, const char* relexprs, int key, bool TRelation::add(int logicnum, const char* relexprs, int key,

5
include/xvtility.cpp
View File

@ -569,13 +569,8 @@ void xvt_set_font(WINDOW win, int family, int style, int dim)
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN
if (dim < 1) if (dim < 1)
{ {
<<<<<<< xvtility.cpp
// LogFont.lfWidth = (style & FS_BOLD) ? width : width;
// LogFont.lfHeight = CHARY - ((style & FS_BOLD) ? 1 : 0);
=======
// LogFont.lfWidth = CHARX - (style & FS_BOLD) ? 2 : 1; // LogFont.lfWidth = CHARX - (style & FS_BOLD) ? 2 : 1;
// LogFont.lfHeight = CHARY - ((style & FS_BOLD) ? 4 : 2); // LogFont.lfHeight = CHARY - ((style & FS_BOLD) ? 4 : 2);
>>>>>>> 1.21
LogFont.lfWeight = FontWeight + ((style & FS_BOLD) ? 300 : 0); LogFont.lfWeight = FontWeight + ((style & FS_BOLD) ? 300 : 0);
LogFont.lfItalic = (style & FS_ITALIC) ? TRUE : FALSE; LogFont.lfItalic = (style & FS_ITALIC) ? TRUE : FALSE;
set_value(NULL_WIN, ATTR_WIN_PM_LOGFONT, (long)&LogFont); set_value(NULL_WIN, ATTR_WIN_PM_LOGFONT, (long)&LogFont);