Merged revision(s) 47606 #d30cca924e, 47652 #54f7e2e148 from trunk:

IPro, TIpHtmlPreview: make printers print always. Issue #27409, patch from Michl.
........
IPro, TIpHtmlPanel: Support color printers. Issue #27420, patch from Michl.
........

git-svn-id: branches/fixes_1_4@47694 -
This commit is contained in:
maxim 2015-02-10 22:52:01 +00:00
parent 8e9787358f
commit c7821af42a
2 changed files with 3 additions and 1 deletions

View File

@ -13000,7 +13000,7 @@ begin
// printer should have 2 colors, somebody else needs to clarify.
BWPrinter := false;
{$ELSE}
BWPrinter := GetDeviceCaps(Printer.Canvas.Handle, PLANES) = 1;
BWPrinter := GetDeviceCaps(Printer.Canvas.Handle, NUMCOLORS) = 2;
{$ENDIF}
{$IFDEF IP_LAZARUS}
LogPixX := Printer.XDPI;
@ -13054,6 +13054,7 @@ var
i : Integer;
begin
if (Hyper <> nil) then begin
Printer.Refresh;
BeginPrint;
Printer.BeginDoc;
try

View File

@ -2124,6 +2124,7 @@ const
VERTRES = 10; { Vertical height in pixels }
BITSPIXEL = 12; { Number of bits per pixel }
PLANES = 14; { Number of planes }
NUMCOLORS = 24; { Number of colors }
LOGPIXELSX = 88; { Logical pixelsinch in X }
LOGPIXELSY = 90; { Logical pixelsinch in Y }
SIZEPALETTE = 104; { Number of entries in physical palette }