diff options
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/dtint.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkgdi.hxx | 5 | ||||
| -rw-r--r-- | vcl/inc/unx/pspgraphics.h | 5 | ||||
| -rw-r--r-- | vcl/inc/unx/saldisp.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/salgdi.h | 8 |
5 files changed, 7 insertions, 15 deletions
diff --git a/vcl/inc/unx/dtint.hxx b/vcl/inc/unx/dtint.hxx index ebe2cae90803..6e6cf13575ed 100644 --- a/vcl/inc/unx/dtint.hxx +++ b/vcl/inc/unx/dtint.hxx @@ -31,12 +31,12 @@ #include <tools/string.hxx> #include <tools/color.hxx> #include <vcl/font.hxx> +#include "svunx.h" class SalBitmap; class SalDisplay; class AllSettings; - enum DtType { DtGeneric, DtCDE diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index d80f109e3e21..bc16e94f832e 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -78,11 +78,8 @@ public: //helper methods for frame's UpdateSettings void updateSettings( AllSettings& rSettings ); + virtual bool setClipRegion( const Region& ); virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uLong nCount ); - virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); - virtual void EndSetClipRegion(); // some themes set the background pixmap of our window EVERY time // a control is painted; but presentation effects need diff --git a/vcl/inc/unx/pspgraphics.h b/vcl/inc/unx/pspgraphics.h index c46e59e63fad..7b39ec80537c 100644 --- a/vcl/inc/unx/pspgraphics.h +++ b/vcl/inc/unx/pspgraphics.h @@ -88,10 +88,7 @@ public: virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uIntPtr nCount ); - virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); - virtual void EndSetClipRegion(); + virtual bool setClipRegion( const Region& ); virtual void SetLineColor(); virtual void SetLineColor( SalColor nSalColor ); diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 2117f43e1a2b..b97044f8036d 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -128,7 +128,7 @@ enum SalRGB { RGB, RBG, RGBA, RBGA, GBRA, GRBA, BGRA, BRGA, - other }; + otherSalRGB }; // -=-= SalVisual =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= class SalVisual : public XVisualInfo diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index e27b2ab31e2d..a6f30ee92930 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -93,7 +93,7 @@ protected: CairoFontsCache m_aCairoFontsCache; XLIB_Region pPaintRegion_; - XLIB_Region pClipRegion_; + XLIB_Region mpClipRegion; GC pPenGC_; // Pen attributes SalColor nPenColor_; @@ -136,6 +136,7 @@ protected: bool bXORMode_ : 1; // is ROP XOR Mode set sal_Bool bDitherBrush_ : 1; // is solid or tile + using SalGraphics::SetClipRegion; void SetClipRegion( GC pGC, XLIB_Region pXReg = NULL ) const; @@ -231,10 +232,7 @@ public: virtual long GetGraphicsHeight() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uIntPtr nCount ); - virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); - virtual void EndSetClipRegion(); + virtual bool setClipRegion( const Region& ); virtual void SetLineColor(); virtual void SetLineColor( SalColor nSalColor ); |