From d2fcc0de8c24307623c8d550438fc7958e3d6164 Mon Sep 17 00:00:00 2001 From: juha Date: Fri, 8 May 2015 10:34:19 +0000 Subject: [PATCH] LCL: Move PrinterCanvas BeginDoc, NewPage and EndDoc to public section. git-svn-id: trunk@48970 - --- components/cairocanvas/cairocanvas.pas | 6 +++--- components/printers/cocoa/cocoaprintcanvas.pas | 6 +++--- lcl/postscriptcanvas.pas | 10 ++++------ lcl/printers.pas | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/components/cairocanvas/cairocanvas.pas b/components/cairocanvas/cairocanvas.pas index 8a308425bc..8437ac3496 100644 --- a/components/cairocanvas/cairocanvas.pas +++ b/components/cairocanvas/cairocanvas.pas @@ -69,9 +69,6 @@ type function CreateCairoHandle: HDC; virtual; abstract; procedure DestroyCairoHandle; virtual; procedure SetHandle(NewHandle: HDC); override; - procedure BeginDoc; override; - procedure EndDoc; override; - procedure NewPage; override; function GetClipRect: TRect; override; procedure SetClipRect(const ARect: TRect); override; function GetClipping: Boolean; override; @@ -89,6 +86,9 @@ type constructor Create(APrinter : TPrinter); override; constructor Create; overload; destructor Destroy; override; + procedure BeginDoc; override; + procedure EndDoc; override; + procedure NewPage; override; procedure FillRect(const ARect: TRect); override; procedure Rectangle(X1,Y1,X2,Y2: Integer); override; procedure Polyline(Points: PPoint; NumPts: Integer); override; diff --git a/components/printers/cocoa/cocoaprintcanvas.pas b/components/printers/cocoa/cocoaprintcanvas.pas index ea8422a5f0..67d1a442fd 100644 --- a/components/printers/cocoa/cocoaprintcanvas.pas +++ b/components/printers/cocoa/cocoaprintcanvas.pas @@ -109,9 +109,6 @@ type procedure DoLineTo(X1,Y1: Integer); override; procedure DoMoveTo({%H-}x, {%H-}y: integer); override; procedure SetHandle(NewHandle: HDC); override; - procedure BeginDoc; override; - procedure EndDoc; override; - procedure NewPage; override; function GetClipRect: TRect; override; procedure SetClipRect(const ARect: TRect); override; function GetClipping: Boolean; override; @@ -129,6 +126,9 @@ type constructor Create(APrinter : TPrinter); override; constructor Create; overload; destructor Destroy; override; + procedure BeginDoc; override; + procedure EndDoc; override; + procedure NewPage; override; procedure FillRect(const ARect: TRect); override; procedure Rectangle(X1,Y1,X2,Y2: Integer); override; procedure Polyline(Points: PPoint; NumPts: Integer); override; diff --git a/lcl/postscriptcanvas.pas b/lcl/postscriptcanvas.pas index 999bb264f7..75574e75d3 100644 --- a/lcl/postscriptcanvas.pas +++ b/lcl/postscriptcanvas.pas @@ -133,18 +133,16 @@ Type function GetClipping: Boolean; override; procedure SetClipping(const AValue: boolean); override; - procedure BeginDoc; override; - procedure EndDoc; override; - procedure NewPage; override; - procedure DoMoveTo(X1,Y1: Integer); override; procedure DoLineTo(X1,Y1: Integer); override; public constructor Create(APrinter : TPrinter); override; destructor Destroy; override; - + procedure BeginDoc; override; + procedure EndDoc; override; + procedure NewPage; override; + procedure SaveToFile(aFileName : string); - procedure Polyline(Points: PPoint; NumPts: Integer); override; procedure PolyBezier(Points: PPoint; NumPts: Integer; diff --git a/lcl/printers.pas b/lcl/printers.pas index 1d0b4d3526..4cc96bba6b 100644 --- a/lcl/printers.pas +++ b/lcl/printers.pas @@ -78,15 +78,15 @@ type procedure SetXDPI(const AValue: Integer); procedure SetYDPI(const AValue: Integer); protected - procedure BeginDoc; virtual; - procedure NewPage; virtual; - procedure EndDoc; virtual; function GetLeftMargin: Integer; function GetTopMargin: Integer; function GetBottomMargin: Integer; function GetRightMargin: Integer; public constructor Create(APrinter: TPrinter); virtual; + procedure BeginDoc; virtual; + procedure NewPage; virtual; + procedure EndDoc; virtual; procedure Changing; override; property Printer : TPrinter read fPrinter;