From 82ea72349fd9c83afba469317c4dfc488d574864 Mon Sep 17 00:00:00 2001 From: villa Date: Wed, 2 Nov 1994 08:47:25 +0000 Subject: [PATCH] Viswin cerca l'editor nella variabile 'txt' del paragrafo 'Link' del file prassi.ini git-svn-id: svn://10.65.10.50/trunk@508 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/printapp.cpp | 30 +++++++++++++++--------------- include/printer.cpp | 3 ++- include/viswin.cpp | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/printapp.cpp b/include/printapp.cpp index 1a47de18b..7689b9f07 100755 --- a/include/printapp.cpp +++ b/include/printapp.cpp @@ -1,4 +1,4 @@ -// $Id: printapp.cpp,v 1.13 1994-10-24 15:06:37 guy Exp $ +// $Id: printapp.cpp,v 1.14 1994-11-02 08:47:08 villa Exp $ #include #include @@ -1096,20 +1096,20 @@ bool TPrint_application::print_one (int file) ((TPrintrow *) (&rw[pt->row ()]))->put (v, pos[pt->row ()]); if (pos[pt->row ()] != -1) { - pos[pt->row ()] += v.len (); - const char * s = v; - while (*s && strncmp(s, "$[", 2) == 0) - { - while (*s && *s != ']') - { - pos[pt->row()]--; - s++; - } - if (*s) - pos[pt->row()]--; - while (*s && *s != '$') s++; - } - } + pos[pt->row ()] += v.len (); + const char* s = v; + while (*s && strncmp(s, "$[", 2) == 0) + { + while (*s && *s != ']') + { + pos[pt->row()]--; + s++; + } + if (*s) + pos[pt->row()]--; + while (*s && *s != '$') s++; + } + } } else if (t->tag () == 2) diff --git a/include/printer.cpp b/include/printer.cpp index 41315a65e..b0d5410ad 100755 --- a/include/printer.cpp +++ b/include/printer.cpp @@ -59,7 +59,7 @@ void TPrinter::_get_windows_printer_names (TToken_string & t) BOOLEAN TPrinter::start_winprint (long data) { PrDesc *pd = (PrDesc *) data; - TTextfile & txt = *(pd->_txt); + TTextfile& txt = *(pd->_txt); TPrintwin pw (pd->_prcd, txt, pd->_charsize); pw.print_background (pd->_graphics); pw.do_print (); @@ -908,6 +908,7 @@ bool TPrinter::printrow (TPrintrow * rowtoprint) if (_printertype == winprinter) { // add line to txt + // CHECK balla colori if (!_frozen) _txt.append (rw); return TRUE; diff --git a/include/viswin.cpp b/include/viswin.cpp index 6be6eb41e..7278ec8ef 100755 --- a/include/viswin.cpp +++ b/include/viswin.cpp @@ -1733,8 +1733,8 @@ default: bool TViswin::call_editor () { - TConfig cnf (CONFIG_STUDIO, "Main"); - TString editor (cnf.get ("Editor")); + TConfig cnf (CONFIG_GENERAL, "Link"); + TString editor (cnf.get ("txt")); bool ok = FALSE;