Modifica 95/35

Corretta get_description nel caso non trovi il paragrafo richiesto


git-svn-id: svn://10.65.10.50/trunk@1862 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1995-09-20 16:10:23 +00:00
parent c2e96baace
commit 233c9acf13
2 changed files with 9 additions and 9 deletions

View File

@ -664,8 +664,6 @@ HIDDEN bool printer_handler (TMask_field & f, KEY key)
return TRUE;
}
#if XVT_OS == XVT_OS_WIN
void TPrinter::set_printrcd()
{
if (_print_rcd != NULL)
@ -681,6 +679,8 @@ PRINT_RCD* TPrinter::get_printrcd(int *size)
return _print_rcd;
}
#if XVT_OS == XVT_OS_WIN
void TPrinter::set_win_formlen(WINDOW prwin)
{
long pw, ph, phr, pvr; // Printer width, height, horizontal and vertical resolution
@ -927,11 +927,11 @@ void TPrinter::read_configuration(const char* parag)
if (what < 0) // Se configurazione annullata ...
{
delete iniptr; iniptr = NULL;
_config = "Printer"; // ... usa configurazione standard
// _config = "Printer"; // ... usa configurazione standard
}
}
if (iniptr == NULL)
iniptr = new TConfig(CONFIG_USER, _config);
iniptr = new TConfig(CONFIG_USER, "Printer");
const int what = iniptr->get_int("Type", NULL, -1, 0); // Tipo stampante
_curprn = iniptr->get_int("Number", NULL, -1, 0); // Numero stampante corrente
@ -1452,7 +1452,7 @@ bool TPrinter::set()
}
((TList_field &)(mask.field (MSK_1_CODES))).replace_items(pn1, pn2);
mask.xvt_win_set_handler (MSK_1_PRINTERS, printer_handler);
mask.set_handler (MSK_1_PRINTERS, printer_handler);
if (_printertype == fileprinter)
mask.set (MSK_1_TYPE, "1");
@ -1547,6 +1547,7 @@ bool TPrinter::set()
if (k == DLG_SETPRINT)
{
// l'handler setta default di windows a quella nel listbox e ribecca l'rcd
#if XVT_OS == XVT_OS_WIN
if (xvt_dm_post_page_setup(get_printrcd()))
{
// see if user has changed printer
@ -1560,7 +1561,8 @@ bool TPrinter::set()
// set_win_formlen(); // Update dimensions
}
else
beep ();
beep ();
#endif
}
}

View File

@ -172,10 +172,8 @@ class TPrinter : public TObject
bool _isgraphics;
bool _frozen;
int _ncopies;
#if XVT_OS == XVT_OS_WIN
PRINT_RCD* _print_rcd;
int _print_rcd_size;
#endif
int _lines_per_inch;
int _vert_offset;
int _horz_offset;
@ -299,9 +297,9 @@ public:
void merge_export_file(const char* file, bool header = TRUE);
word rows() const { return _formlen-_headersize-_footersize; }
word rows_left() const;
#if XVT_OS == XVT_OS_WIN
void set_printrcd();
PRINT_RCD* get_printrcd(int* size = NULL);
#if XVT_OS == XVT_OS_WIN
void set_win_formlen(WINDOW prwin = NULL_WIN);
#endif
void set_lines_per_inch(int n) { _lines_per_inch = n; }