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

Modifiche dalla versione Linux sulla 2.1

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@12034 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2004-04-29 09:59:24 +00:00
parent 6b83d9a1ae
commit a8614784fa
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/colors.cpp
View File

@ -87,6 +87,8 @@ TColor_row_mask::TColor_row_mask()
void TColor_row_mask::update() void TColor_row_mask::update()
{ {
TSheet_field* s = get_sheet(); TSheet_field* s = get_sheet();
if (s == NULL)
return;
TSelect_color_mask& m = (TSelect_color_mask&)s->mask(); TSelect_color_mask& m = (TSelect_color_mask&)s->mask();
COLOR back, fore; COLOR back, fore;
m.get_cur_colors(back, fore); m.get_cur_colors(back, fore);

7
include/controls.cpp
View File

@ -177,17 +177,14 @@ XVT_FNTID xvt_default_font(bool bold)
ROWY = (pc.bottom - pc.top) / 25; ROWY = (pc.bottom - pc.top) / 25;
const int COLX = (pc.right - pc.left) / 80; const int COLX = (pc.right - pc.left) / 80;
// Vecchio metodo di calcolo di CHARX dipendente dalla moda TString str(80, 'M');
// TString str(80, 'M'); CHARX = xvt_dwin_get_text_width(TASK_WIN, str.get_buffer(), str.size()) / str.size();
// CHARX = xvt_dwin_get_text_width(TASK_WIN, str.get_buffer(), str.size()) / str.size();
int leading, ascent, descent; int leading, ascent, descent;
xvt_dwin_get_font_metrics(TASK_WIN, &leading, &ascent, &descent); xvt_dwin_get_font_metrics(TASK_WIN, &leading, &ascent, &descent);
CHARY = ascent + descent + 1; CHARY = ascent + descent + 1;
BASEY = ascent; BASEY = ascent;
CHARX = 3*ascent/4; // Nuovo metodo di calcolo di CHARX piu' stabile
if (CHARX > COLX) if (CHARX > COLX)
CHARX = COLX; CHARX = COLX;

3
include/relapp.cpp
View File

@ -1670,8 +1670,7 @@ bool TRelation_application::parse_command_line()
for (int i = argc()-1; i > 0; i--) for (int i = argc()-1; i > 0; i--)
{ {
ini = argv(i); ini = argv(i);
ini.upper(); if ((ini[0] == '-' || ini[0] == '/') && (ini[1] == 'I' || ini[1] == 'i'))
if ((ini[0] == '-' || ini[0] == '/') && ini[1] == 'I')
{ {
ini.ltrim(2); ini.ltrim(2);
CHECK(!ini.blank(),"Manca l'indicazione della transazione. Il nome va indicato di seguito al -i, senza interporre spaziatura."); CHECK(!ini.blank(),"Manca l'indicazione della transazione. Il nome va indicato di seguito al -i, senza interporre spaziatura.");