diff options
Diffstat (limited to 'vcl/inc/vcl/fixed.hxx')
| -rw-r--r-- | vcl/inc/vcl/fixed.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index 42061cfa09ea..3912f19e778a 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -48,11 +48,11 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bFillLayout = false ) const; public: - SAL_DLLPRIVATE static USHORT ImplGetTextStyle( WinBits nWinBits ); + SAL_DLLPRIVATE static sal_uInt16 ImplGetTextStyle( WinBits nWinBits ); protected: virtual void FillLayoutData() const; virtual const Font& @@ -66,7 +66,7 @@ public: FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -87,7 +87,7 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); protected: @@ -102,7 +102,7 @@ public: FixedLine( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -124,7 +124,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); protected: @@ -136,7 +136,7 @@ public: ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -144,7 +144,7 @@ public: void SetBitmap( const Bitmap& rBitmap ); using OutputDevice::GetBitmap; const Bitmap& GetBitmap() const { return maBitmap; } - BOOL SetModeBitmap( const Bitmap& rBitmap ); + sal_Bool SetModeBitmap( const Bitmap& rBitmap ); const Bitmap& GetModeBitmap( ) const; }; @@ -156,7 +156,7 @@ class VCL_DLLPUBLIC FixedImage : public Control { private: Image maImage; - BOOL mbInUserDraw; + sal_Bool mbInUserDraw; private: using Control::ImplInitSettings; @@ -164,10 +164,10 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, - const Point& rPos, const Size& rSize ); protected: + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, + const Point& rPos, const Size& rSize ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -176,7 +176,7 @@ public: ~FixedImage(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -186,7 +186,7 @@ public: void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } - BOOL SetModeImage( const Image& rImage ); + sal_Bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; Point CalcImagePos( const Point& rPos, |