diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
| commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
| tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/inc/salobj.hxx | |
| parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'vcl/inc/salobj.hxx')
| -rw-r--r-- | vcl/inc/salobj.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 44d556b39eb0..81078dcdcaf1 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -39,9 +39,9 @@ struct SystemEnvData; // - SalObject-Types - // ------------------- -#define SAL_OBJECT_CLIP_INCLUDERECTS ((USHORT)0x0001) -#define SAL_OBJECT_CLIP_EXCLUDERECTS ((USHORT)0x0002) -#define SAL_OBJECT_CLIP_ABSOLUTE ((USHORT)0x0004) +#define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001) +#define SAL_OBJECT_CLIP_EXCLUDERECTS ((sal_uInt16)0x0002) +#define SAL_OBJECT_CLIP_ABSOLUTE ((sal_uInt16)0x0004) // ------------- // - SalObject - @@ -51,21 +51,21 @@ class VCL_DLLPUBLIC SalObject { void* m_pInst; SALOBJECTPROC m_pCallback; - BOOL m_bMouseTransparent:1, + sal_Bool m_bMouseTransparent:1, m_bEraseBackground:1; public: - SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( FALSE ), m_bEraseBackground( TRUE ) {} + SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( sal_False ), m_bEraseBackground( sal_True ) {} virtual ~SalObject(); virtual void ResetClipRegion() = 0; - virtual USHORT GetClipRegionType() = 0; - virtual void BeginSetClipRegion( ULONG nRects ) = 0; + virtual sal_uInt16 GetClipRegionType() = 0; + virtual void BeginSetClipRegion( sal_uLong nRects ) = 0; virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void EndSetClipRegion() = 0; virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual void Show( BOOL bVisible ) = 0; - virtual void Enable( BOOL nEnable ) = 0; + virtual void Show( sal_Bool bVisible ) = 0; + virtual void Enable( sal_Bool nEnable ) = 0; virtual void GrabFocus() = 0; virtual void SetBackground() = 0; @@ -77,15 +77,15 @@ public: void SetCallback( void* pInst, SALOBJECTPROC pProc ) { m_pInst = pInst; m_pCallback = pProc; } - long CallCallback( USHORT nEvent, const void* pEvent ) + long CallCallback( sal_uInt16 nEvent, const void* pEvent ) { return m_pCallback ? m_pCallback( m_pInst, this, nEvent, pEvent ) : 0; } - void SetMouseTransparent( BOOL bMouseTransparent ) + void SetMouseTransparent( sal_Bool bMouseTransparent ) { m_bMouseTransparent = bMouseTransparent; } - BOOL IsMouseTransparent() + sal_Bool IsMouseTransparent() { return m_bMouseTransparent; } - void EnableEraseBackground( BOOL bEnable ) + void EnableEraseBackground( sal_Bool bEnable ) { m_bEraseBackground = bEnable; } - BOOL IsEraseBackgroundEnabled() + sal_Bool IsEraseBackgroundEnabled() { return m_bEraseBackground; } }; |