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:
parent
9b1e882981
commit
ec1484ce7d
@ -782,18 +782,23 @@ HIDDEN bool font_handler(TMask_field& f, KEY key)
|
||||
TToken_string pn1(80), pn2(80);
|
||||
|
||||
if (scalable)
|
||||
{
|
||||
for (int i = 4; i <= 32; i++)
|
||||
{
|
||||
pn1.add(i);
|
||||
pn2.add(i);
|
||||
}
|
||||
}
|
||||
else
|
||||
for (int i = 0; i < num_sizes; i++)
|
||||
{
|
||||
if (num_sizes > 0)
|
||||
{
|
||||
pn1.add(sizes[i]);
|
||||
pn2.add(sizes[i]);
|
||||
for (int i = 0; i < num_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);
|
||||
lst.replace_items(pn1, pn2);
|
||||
lst.set(format("%d", printer().get_char_size()));
|
||||
@ -1502,15 +1507,16 @@ void TPrinter::set()
|
||||
pn2 = getprinternames();
|
||||
char old_default[80];
|
||||
GetProfileString ("windows", "device", ",,,", old_default, sizeof(old_default));
|
||||
|
||||
for (i = 0; i < pn2.items (); i++)
|
||||
pn1.add(i);
|
||||
|
||||
const int np = pn2.items();
|
||||
for (i = 0; i < np; i++)
|
||||
pn1.add(i);
|
||||
|
||||
TList_field& plst = (TList_field&)mask.field (MSK_1_PRINTERS);
|
||||
plst.replace_items(pn1, pn2);
|
||||
plst.set(pn1.get(_curprn));
|
||||
plst.replace_items(pn1, pn2); // Genera printer list
|
||||
|
||||
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_LINES, _lines_per_inch);
|
||||
mask.set(MSK_1_ISGRAPHICS, _isgraphics ? "X" : "");
|
||||
|
Loading…
x
Reference in New Issue
Block a user