summaryrefslogtreecommitdiff
path: root/include/vcl/window.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-27 14:52:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-30 09:58:23 +0200
commit8dbde0845a3989528614addb9bd0333f60c522a5 (patch)
treec1f13bfc8e2841427eb6a07e2147445b309b1e9a /include/vcl/window.hxx
parentb69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff)
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11 Region typedef. Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
Diffstat (limited to 'include/vcl/window.hxx')
-rw-r--r--include/vcl/window.hxx86
1 files changed, 43 insertions, 43 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ce75def7b31f..ae9481973ba0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -354,9 +354,9 @@ struct WindowResHeader
namespace vcl {
-class VCL_DLLPUBLIC Window : public OutputDevice, public Resource
+class VCL_DLLPUBLIC Window : public ::OutputDevice, public Resource
{
- friend class vcl::Cursor;
+ friend class ::vcl::Cursor;
friend class ::OutputDevice;
friend class ::Application;
friend class ::SystemWindow;
@@ -379,7 +379,7 @@ class VCL_DLLPUBLIC Window : public OutputDevice, public Resource
friend class ::ImplPopupFloatWin;
friend class ::MenuFloatingWindow;
- friend class svt::PopupWindowControllerImpl;
+ friend class ::svt::PopupWindowControllerImpl;
private:
// NOTE: to remove many dependencies of other modules
@@ -395,7 +395,7 @@ private:
// This is a first attempt to start to remove the dependency of Window on
// OutputDevice
- OutputDevice* mpOutputDevice;
+ ::OutputDevice* mpOutputDevice;
#ifdef DBG_UTIL
friend const char* ::ImplDbgCheckWindow( const void* pObj );
@@ -425,8 +425,8 @@ public:
SAL_DLLPRIVATE vcl::Window* ImplGetParent() const;
SAL_DLLPRIVATE vcl::Window* ImplFindWindow( const Point& rFramePos );
- SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags );
- SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const Region& rRegion );
+ SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const vcl::Region* pRegion, sal_uInt16 nFlags );
+ SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion );
SAL_DLLPRIVATE bool ImplSetClipFlag( bool bSysObjOnlySmaller = false );
@@ -482,15 +482,15 @@ protected:
SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos );
- SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( Region& rRegion );
- SAL_DLLPRIVATE void ImplValidateFrameRegion( const Region* rRegion, sal_uInt16 nFlags );
- SAL_DLLPRIVATE void ImplValidate( const Region* rRegion, sal_uInt16 nFlags );
+ SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplValidateFrameRegion( const vcl::Region* rRegion, sal_uInt16 nFlags );
+ SAL_DLLPRIVATE void ImplValidate( const vcl::Region* rRegion, sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren );
SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren );
SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const;
- SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags );
+ SAL_DLLPRIVATE void ImplInvalidate( const vcl::Region* rRegion, sal_uInt16 nFlags );
SAL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rFramePos );
@@ -499,7 +499,7 @@ protected:
SAL_DLLPRIVATE void ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplSaveOverlapBackground();
- SAL_DLLPRIVATE bool ImplRestoreOverlapBackground( Region& rInvRegion );
+ SAL_DLLPRIVATE bool ImplRestoreOverlapBackground( vcl::Region& rInvRegion );
SAL_DLLPRIVATE void ImplInvalidateAllOverlapBackgrounds();
SAL_DLLPRIVATE bool ImplSetClipFlagChildren( bool bSysObjOnlySmaller = false );
@@ -540,33 +540,33 @@ private:
SAL_DLLPRIVATE void ImplPointToLogic( vcl::Font& rFont ) const;
SAL_DLLPRIVATE void ImplLogicToPoint( vcl::Font& rFont ) const;
- SAL_DLLPRIVATE bool ImplSysObjClip( const Region* pOldRegion );
+ SAL_DLLPRIVATE bool ImplSysObjClip( const vcl::Region* pOldRegion );
SAL_DLLPRIVATE void ImplUpdateSysObjChildrenClip();
SAL_DLLPRIVATE void ImplUpdateSysObjOverlapsClip();
SAL_DLLPRIVATE void ImplUpdateSysObjClip();
- SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( Region& rRegion );
- SAL_DLLPRIVATE void ImplIntersectWindowRegion( Region& rRegion );
- SAL_DLLPRIVATE void ImplExcludeWindowRegion( Region& rRegion );
- SAL_DLLPRIVATE void ImplExcludeOverlapWindows( Region& rRegion );
- SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( Region& rRegion );
+ SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplIntersectWindowRegion( vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplExcludeWindowRegion( vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplExcludeOverlapWindows( vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( vcl::Region& rRegion );
- SAL_DLLPRIVATE void ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps );
- SAL_DLLPRIVATE bool ImplClipChildren( Region& rRegion );
- SAL_DLLPRIVATE void ImplClipAllChildren( Region& rRegion );
- SAL_DLLPRIVATE void ImplClipSiblings( Region& rRegion );
+ SAL_DLLPRIVATE void ImplClipBoundaries( vcl::Region& rRegion, bool bThis, bool bOverlaps );
+ SAL_DLLPRIVATE bool ImplClipChildren( vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplClipAllChildren( vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplClipSiblings( vcl::Region& rRegion );
SAL_DLLPRIVATE void ImplInitWinClipRegion();
SAL_DLLPRIVATE void ImplInitWinChildClipRegion();
- SAL_DLLPRIVATE Region* ImplGetWinChildClipRegion();
+ SAL_DLLPRIVATE vcl::Region* ImplGetWinChildClipRegion();
- SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion );
- SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion );
- SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion );
- SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion,
+ SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const vcl::Region& rInterRegion, vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion );
+ SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect, vcl::Region& rRegion,
bool bChildren, bool bParent, bool bSiblings );
- SAL_DLLPRIVATE void ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags );
+ SAL_DLLPRIVATE void ImplCallPaint( const vcl::Region* pRegion, sal_uInt16 nPaintFlags );
SAL_DLLPRIVATE void ImplCallOverlapPaint();
SAL_DLLPRIVATE void ImplPostPaint();
@@ -636,13 +636,13 @@ private:
SAL_DLLPRIVATE bool ImplStopDnd();
SAL_DLLPRIVATE void ImplStartDnd();
- SAL_DLLPRIVATE void ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos );
+ SAL_DLLPRIVATE void ImplPaintToDevice( ::OutputDevice* pTargetOutDev, const Point& rPos );
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >
ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const;
public:
- virtual Region GetActiveClipRegion() const SAL_OVERRIDE;
+ virtual vcl::Region GetActiveClipRegion() const SAL_OVERRIDE;
protected:
// Single argument ctors shall be explicit.
@@ -678,8 +678,8 @@ public:
Window( vcl::Window* pParent, const ResId& rResId );
virtual ~Window();
- OutputDevice const* GetOutDev() const { return mpOutputDevice; };
- OutputDevice* GetOutDev() { return mpOutputDevice; };
+ ::OutputDevice const* GetOutDev() const { return mpOutputDevice; };
+ ::OutputDevice* GetOutDev() { return mpOutputDevice; };
virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt );
@@ -690,10 +690,10 @@ public:
virtual void PrePaint();
virtual void Paint( const Rectangle& rRect );
virtual void Erase() SAL_OVERRIDE;
- virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { OutputDevice::Erase( rRect ); }
+ virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); }
virtual void PostPaint();
- virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
+ virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Move();
virtual void Resize();
virtual void Activate();
@@ -782,7 +782,7 @@ public:
void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false );
- using OutputDevice::SetSettings;
+ using ::OutputDevice::SetSettings;
virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE;
virtual void SetSettings( const AllSettings& rSettings, bool bChild );
void UpdateSettings( const AllSettings& rSettings, bool bChild = false );
@@ -791,8 +791,8 @@ public:
void SetPointFont( const vcl::Font& rFont );
vcl::Font GetPointFont() const;
void SetZoomedPointFont( const vcl::Font& rFont );
- long GetDrawPixel( OutputDevice* pDev, long nPixels ) const;
- vcl::Font GetDrawPixelFont( OutputDevice* pDev ) const;
+ long GetDrawPixel( ::OutputDevice* pDev, long nPixels ) const;
+ vcl::Font GetDrawPixelFont( ::OutputDevice* pDev ) const;
void SetControlFont();
void SetControlFont( const vcl::Font& rFont );
@@ -811,16 +811,16 @@ public:
sal_uInt16 GetParentClipMode() const;
void SetWindowRegionPixel();
- void SetWindowRegionPixel( const Region& rRegion );
- const Region& GetWindowRegionPixel() const;
+ void SetWindowRegionPixel( const vcl::Region& rRegion );
+ const vcl::Region& GetWindowRegionPixel() const;
bool IsWindowRegionPixel() const;
- Region GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const;
- Region GetPaintRegion() const;
+ vcl::Region GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const;
+ vcl::Region GetPaintRegion() const;
bool IsInPaint() const;
// while IsInPaint returns true ExpandPaintClipRegion adds the
// submitted region to the paint clip region so you can
// paint additional parts of your window if necessary
- void ExpandPaintClipRegion( const Region& rRegion );
+ void ExpandPaintClipRegion( const vcl::Region& rRegion );
void SetParent( vcl::Window* pNewParent );
vcl::Window* GetParent() const;
@@ -953,7 +953,7 @@ public:
const Rectangle& rRect, sal_uInt16 nFlags = 0 );
virtual void Invalidate( sal_uInt16 nFlags = 0 );
virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 );
- virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 );
+ virtual void Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags = 0 );
void Validate( sal_uInt16 nFlags = 0 );
bool HasPaintEvent() const;
void Update();
@@ -1408,7 +1408,7 @@ public:
bool IsNativeWidgetEnabled() const;
// a helper method for a Control's Draw method
- void PaintToDevice( OutputDevice* pDevice, const Point& rPos, const Size& rSize );
+ void PaintToDevice( ::OutputDevice* pDevice, const Point& rPos, const Size& rSize );
/* mark Window for deletion in top of event queue
*/