Corretta generazione lista font e relative dimensioni

git-svn-id: svn://10.65.10.50/trunk@1388 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-05-23 09:58:43 +00:00
parent 9b1e882981
commit ec1484ce7d

View File

@ -782,18 +782,23 @@ HIDDEN bool font_handler(TMask_field& f, KEY key)
TToken_string pn1(80), pn2(80); TToken_string pn1(80), pn2(80);
if (scalable) if (scalable)
{
for (int i = 4; i <= 32; i++) for (int i = 4; i <= 32; i++)
{ {
pn1.add(i); pn1.add(i);
pn2.add(i); pn2.add(i);
} }
}
else else
for (int i = 0; i < num_sizes; i++) {
if (num_sizes > 0)
{ {
pn1.add(sizes[i]); for (int i = 0; i < num_sizes; i++)
pn2.add(sizes[i]); pn1.add(sizes[i]);
} }
else pn1.add(printer().get_char_size());
pn2 = pn1;
}
TList_field& lst = (TList_field&)f.mask().field(MSK_1_SIZE); TList_field& lst = (TList_field&)f.mask().field(MSK_1_SIZE);
lst.replace_items(pn1, pn2); lst.replace_items(pn1, pn2);
lst.set(format("%d", printer().get_char_size())); lst.set(format("%d", printer().get_char_size()));
@ -1503,14 +1508,15 @@ void TPrinter::set()
char old_default[80]; char old_default[80];
GetProfileString ("windows", "device", ",,,", old_default, sizeof(old_default)); GetProfileString ("windows", "device", ",,,", old_default, sizeof(old_default));
for (i = 0; i < pn2.items (); i++) const int np = pn2.items();
for (i = 0; i < np; i++)
pn1.add(i); pn1.add(i);
TList_field& plst = (TList_field&)mask.field (MSK_1_PRINTERS); TList_field& plst = (TList_field&)mask.field (MSK_1_PRINTERS);
plst.replace_items(pn1, pn2); plst.replace_items(pn1, pn2); // Genera printer list
plst.set(pn1.get(_curprn));
mask.set(MSK_1_FONT, _fontname); mask.set(MSK_1_PRINTERS, _curprn, TRUE); // Genera font list
mask.set(MSK_1_FONT, _fontname, TRUE); // Genera size list
mask.set(MSK_1_SIZE, _ch_size); mask.set(MSK_1_SIZE, _ch_size);
mask.set(MSK_1_LINES, _lines_per_inch); mask.set(MSK_1_LINES, _lines_per_inch);
mask.set(MSK_1_ISGRAPHICS, _isgraphics ? "X" : ""); mask.set(MSK_1_ISGRAPHICS, _isgraphics ? "X" : "");