diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:30:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:30:56 +0000 |
| commit | ff2cf41bb012e45c0b5dab467c90f37e4944a87e (patch) | |
| tree | 1cade1a4fd578e6f5105c0aa57c8d6130b3fbaee /vcl/aqua | |
| parent | 78256518234f929d9fcba7cdd40cd9393570b1bd (diff) | |
INTEGRATION: CWS aw033 (1.35.38); FILE MERGED
2008/08/19 16:00:15 cl 1.35.38.9: RESYNC: (1.43-1.44); FILE MERGED
2008/07/11 11:43:06 aw 1.35.38.8: RESYNC: (1.41-1.43); FILE MERGED
2008/07/02 13:57:16 pl 1.35.38.7: solve a merge problem
2008/07/02 13:05:31 pl 1.35.38.6: solve a merge problem
2008/06/25 13:10:52 aw 1.35.38.5: RESYNC: (1.37-1.41); FILE MERGED
2008/05/14 15:07:47 aw 1.35.38.4: RESYNC: (1.35-1.37); FILE MERGED
2008/03/18 14:32:41 hdu 1.35.38.3: #i87185# Aqua: use CGPath bounds instead of B2DPolygon bounds
2008/03/18 13:58:37 hdu 1.35.38.2: #i87185# Aqua: add utility method AddPolygonToPath()
2008/03/18 11:09:54 hdu 1.35.38.1: #i87185# Aqua: support B2D polygons in VCL
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/inc/salgdi.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h index c567f32d4432..b39685d35579 100644 --- a/vcl/aqua/inc/salgdi.h +++ b/vcl/aqua/inc/salgdi.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdi.h,v $ - * $Revision: 1.44 $ + * $Revision: 1.45 $ * * This file is part of OpenOffice.org. * @@ -48,6 +48,8 @@ class AquaSalFrame; class AquaSalBitmap; class ImplDevFontAttributes; +class CGRect; + // mac specific physically available font face class ImplMacFontData : public ImplFontData { @@ -166,8 +168,8 @@ public: bool CheckContext(); void UpdateWindow( NSRect& rRect ); // delivered in NSView coordinates - void RefreshRect(float lX, float lY, float lWidth, float lHeight); void RefreshRect( const CGRect& ); + void RefreshRect(float lX, float lY, float lWidth, float lHeight); void SetState(); @@ -183,10 +185,10 @@ public: virtual void drawPolygon( ULONG nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); - virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidths ); virtual sal_Bool drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ); virtual sal_Bool drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ); + virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin); // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, |