diff options
| -rw-r--r-- | include/vcl/toolkit/button.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/button.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index a470ea28d7c1..a9b81b0edb00 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -23,7 +23,6 @@ #error "don't use this in new code" #endif -#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/image.hxx> #include <vcl/ctrl.hxx> @@ -52,7 +51,7 @@ private: public: SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( WinBits nWinStyle, DrawFlags nDrawFlags ); SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize, - sal_uLong nImageSep, + sal_Int32 nImageSep, DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false ); SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle &rFocusRect ); SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index b08cc9772d62..d6529c8bf311 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -205,7 +205,7 @@ DrawTextFlags Button::ImplGetTextStyle( WinBits nWinStyle, DrawFlags nDrawFlags void Button::ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize, - sal_uLong nImageSep, + sal_Int32 nImageSep, DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect, bool bAddImageSep) { @@ -842,7 +842,7 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice *pDev, DrawFlags nDrawFl Size aSize = rRect.GetSize(); Point aPos = rRect.TopLeft(); - sal_uLong nImageSep = 1 + (pDev->GetTextHeight()-10)/2; + sal_Int32 nImageSep = 1 + (pDev->GetTextHeight()-10)/2; if( nImageSep < 1 ) nImageSep = 1; if ( mnDDStyle == PushButtonDropdownStyle::MenuButton || |