diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-06-03 16:51:02 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-03 16:08:06 +0100 |
| commit | 12d02918976fbefb2997ebe8bd6a38fb2494217b (patch) | |
| tree | d6c7ca815c77d27112707b6d85fe5af9f304b048 /vcl | |
| parent | db9cb9a6667f7690600aaf72d38954dd7c69ae7f (diff) | |
Fix 64-bit build
When compiling as 64-bit code, NSRect *is* CGRect.
Change-Id: Ia14db1354251bd2a2f53fd9d02dc2816ccef2b17
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/coretext/salgdi2.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h index 90fb594b9e8c..76937376668f 100644 --- a/vcl/inc/coretext/salgdi2.h +++ b/vcl/inc/coretext/salgdi2.h @@ -199,7 +199,9 @@ public: bool CheckContext(); CGContextRef GetContext(); void UpdateWindow( NSRect& ); // delivered in NSView coordinates +#if !defined(__LP64__) && !defined(NS_BUILD_32_LIKE_64) void RefreshRect( const CGRect& ); +#endif void RefreshRect( const NSRect& ); void RefreshRect(float lX, float lY, float lWidth, float lHeight); @@ -217,7 +219,7 @@ public: virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ); virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ); - virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uLong* pPoints, PCONSTSALPOINT* pPtAry ); + virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); @@ -398,11 +400,15 @@ private: // --- some trivial inlines +#if !defined(__LP64__) && !defined(NS_BUILD_32_LIKE_64) + inline void AquaSalGraphics::RefreshRect( const CGRect& rRect ) { RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height ); } +#endif + inline void AquaSalGraphics::RefreshRect( const NSRect& rRect ) { RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height ); |