Correzioni sui lock nei *.c
Corretti alcuni colori di default errati git-svn-id: svn://10.65.10.50/trunk@848 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
38c58e1b07
commit
b578478c71
@ -152,6 +152,7 @@ lock = variabile per eseguire comandi di lock.
|
||||
if ( _locking(S->F,lm, 1L) == -1)
|
||||
{
|
||||
S->IOR = CIOResult();
|
||||
|
||||
if (S->IOR == EACCES) S->IOR = EAGAIN;
|
||||
if (LockMode == UnLock || LockMode == NoLock) S->IOR = NoErr;
|
||||
if (S->IOR != NoErr) return(-1);
|
||||
|
@ -132,6 +132,7 @@ Se si utilizza spiegarne dettagliatamente il motivo.
|
||||
do
|
||||
{
|
||||
CRead(&fdir[dirflg],(RecType) filed,(long) logicname, lockmode);
|
||||
|
||||
if (TESTLOCK(fdir[dirflg].IOR))
|
||||
message_box("Sono in attesa della directory n.ro %d", logicname);
|
||||
}
|
||||
|
@ -672,7 +672,7 @@ wrec = buffer di lavoro.
|
||||
if (isfd->ln > 0)
|
||||
{
|
||||
COpenDir (ManuLock, isfd->ft);
|
||||
COpenFile(isfd->ln,isfd->d, Lock, isfd->ft);
|
||||
COpenFile(isfd->ln,isfd->d, NoLock, isfd->ft);
|
||||
}
|
||||
if (isfd->d->EOD == isfd->d->EOX)
|
||||
{
|
||||
@ -704,10 +704,7 @@ wrec = buffer di lavoro.
|
||||
else
|
||||
{
|
||||
if (isfd->ln > 0)
|
||||
{
|
||||
COpenFile(isfd->ln,isfd->d, UnLock, isfd->ft);
|
||||
CCloseDir(isfd->ft);
|
||||
}
|
||||
isfd->RecNo = 0;
|
||||
if (DEADLOCK(*err)) *err = IsDeadLock;
|
||||
return((*err ? *err : (*err = IsFileFull)));
|
||||
@ -727,14 +724,15 @@ wrec = buffer di lavoro.
|
||||
{
|
||||
*err = IsReInsert;
|
||||
if (isfd->ln > 0)
|
||||
{
|
||||
COpenFile(isfd->ln,isfd->d, UnLock, isfd->ft);
|
||||
CCloseDir(isfd->ft);
|
||||
}
|
||||
isfd->RecNo = 0;
|
||||
return(*err);
|
||||
}
|
||||
}
|
||||
if (isfd->ln > 0)
|
||||
{
|
||||
COpenFile(isfd->ln,isfd->d, Lock, isfd->ft);
|
||||
}
|
||||
isfd->RecNo = (++isfd->d->EOD);
|
||||
if ((isfd->r->NKeys) && IndActive)
|
||||
{
|
||||
@ -748,11 +746,15 @@ wrec = buffer di lavoro.
|
||||
isfd->RecNo = 0;
|
||||
junk = delkeys(isfd, record, knum, &werr);
|
||||
}
|
||||
else
|
||||
/* else
|
||||
if (isfd->ln > 0)
|
||||
CCloseFile(isfd->ln,isfd->d, isfd->ft) ;
|
||||
CCloseFile(isfd->ln,isfd->d, isfd->ft) ; */
|
||||
}
|
||||
else isfd->d->EOD-- ;
|
||||
if (isfd->ln > 0)
|
||||
{
|
||||
CCloseFile(isfd->ln,isfd->d, isfd->ft) ;
|
||||
}
|
||||
if(test_share() && isfd->f.LockMode != ExclLock)
|
||||
CBUnLockFile(&isfd->i, &werr) ;
|
||||
}
|
||||
|
@ -116,10 +116,6 @@ void TSpreadsheet::init()
|
||||
|
||||
xi_init();
|
||||
xi_set_pref(XI_PREF_3D_LOOK, TRUE);
|
||||
// xi_set_pref(XI_PREF_COLOR_LIGHT, COLOR_CYAN);
|
||||
// xi_set_pref(XI_PREF_COLOR_CTRL, MASK_BACK_COLOR);
|
||||
// xi_set_pref(XI_PREF_COLOR_DARK, COLOR_GRAY);
|
||||
|
||||
first = FALSE;
|
||||
}
|
||||
|
||||
@ -222,7 +218,7 @@ TSpreadsheet::TSpreadsheet(short x, short y, short dx, short dy,
|
||||
listdef->v.list->width = rct.right-rct.left;
|
||||
listdef->v.list->min_cell_height = CHARY;
|
||||
listdef->v.list->min_heading_height = CHARY;
|
||||
listdef->v.list->white_space_color = COLOR_GRAY;
|
||||
listdef->v.list->white_space_color = MASK_DARK_COLOR;
|
||||
|
||||
XI_OBJ_DEF* coldef = xi_add_column_def(listdef, 0,
|
||||
XI_ATR_RJUST, 0, NUMBER_WIDTH, NUMBER_WIDTH, "");
|
||||
@ -514,7 +510,7 @@ break;
|
||||
xiev->v.cell_request.button_on_focus = TRUE;
|
||||
}
|
||||
if (cell_disabled(rec, col))
|
||||
xiev->v.cell_request.back_color = MASK_BACK_COLOR;
|
||||
xiev->v.cell_request.back_color = DISABLED_BACK_COLOR;
|
||||
}
|
||||
}
|
||||
} else src = format("%d", rec+1);
|
||||
|
@ -753,7 +753,7 @@ void TBrowse_sheet::repos_buttons() const
|
||||
|
||||
int left = CHARX; // left coord of next control to draw
|
||||
|
||||
for (int i = 0; i < 1; i++)
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
const short id = i ? DLG_EDIT : DLG_FINDREC;
|
||||
const WINDOW w = get_ctl_window(win(), id);
|
||||
|
Loading…
x
Reference in New Issue
Block a user