From 8f0061aed5f6935bce538854262ec5487e7bf349 Mon Sep 17 00:00:00 2001 From: villa Date: Fri, 18 Nov 1994 11:42:22 +0000 Subject: [PATCH] Aggiustato acceleratore maschera impostazione stampante Cambiati #defines in lffiles per partite e scadenze Eliminato per ora il grassetto a video in viswin git-svn-id: svn://10.65.10.50/trunk@661 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/bagn001a.uml | 4 ++-- include/lffiles.h | 4 ++-- include/viswin.cpp | 5 +++-- include/xvtility.cpp | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/bagn001a.uml b/include/bagn001a.uml index 2fb6f8cdf..683dc2d37 100755 --- a/include/bagn001a.uml +++ b/include/bagn001a.uml @@ -102,14 +102,14 @@ END BUTTON DLG_SETPRINT 9 2 BEGIN - PROMPT -14 -2 "Imposta" + PROMPT -14 -2 "~Imposta" HELP "Chiama l'Impostazione Stampante di Windows" MESSAGE EXIT,DLG_SETPRINT END BUTTON DLG_SAVEREC 9 2 BEGIN - PROMPT -24 -2 "" + PROMPT -24 -2 "~Registra" MESSAGE EXIT,K_INS END diff --git a/include/lffiles.h b/include/lffiles.h index b6ea96439..1966d728a 100755 --- a/include/lffiles.h +++ b/include/lffiles.h @@ -27,8 +27,8 @@ #define LF_RMOVIVA 25 #define LF_CAUSALI 26 #define LF_RCAUSALI 27 -#define LF_SCADENZE 28 -#define LF_PAGAMENTI 29 +#define LF_PARTITE 28 +#define LF_SCADENZE 29 #define LF_PAGSCAD 30 #define LF_EFFETTI 31 #define LF_CESS 32 diff --git a/include/viswin.cpp b/include/viswin.cpp index b6f13af95..2af41d6b7 100755 --- a/include/viswin.cpp +++ b/include/viswin.cpp @@ -549,10 +549,11 @@ void TViswin::paint_row (long j) while (cp = _txt.piece ()) { #if XVT_OS != XVT_OS_SCOUNIX - int st = _txt.get_style (); + int st = _txt.get_style (); long bg = trans_color (_txt.get_background ()); long fg = trans_color (_txt.get_foreground ()); - set_font (FF_FIXED, st & 0x000f); + // per ora disabilitiamo il grassetto + set_font (FF_FIXED, (st & 0x000f) & ~FS_BOLD); set_color (fg, bg); #else set_color (COLOR_BLACK, COLOR_WHITE); diff --git a/include/xvtility.cpp b/include/xvtility.cpp index 10261e063..1caf75d40 100755 --- a/include/xvtility.cpp +++ b/include/xvtility.cpp @@ -569,8 +569,8 @@ void xvt_set_font(WINDOW win, int family, int style, int dim) #if XVT_OS == XVT_OS_WIN if (dim < 1) { - // LogFont.lfWidth = (style & FS_BOLD) ? width : width; - // LogFont.lfHeight = CHARY + ((style & FS_BOLD) ? 2 : 0); + // LogFont.lfWidth = CHARX - (style & FS_BOLD) ? 2 : 1; + // LogFont.lfHeight = CHARY - ((style & FS_BOLD) ? 4 : 2); LogFont.lfWeight = FontWeight + ((style & FS_BOLD) ? 300 : 0); LogFont.lfItalic = (style & FS_ITALIC) ? TRUE : FALSE; set_value(NULL_WIN, ATTR_WIN_PM_LOGFONT, (long)&LogFont);