summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fpicker/source/office/iodlgimp.cxx2
-rw-r--r--include/vcl/button.hxx38
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx2
-rw-r--r--vcl/source/control/button.cxx10
-rw-r--r--vcl/source/control/menubtn.cxx4
5 files changed, 30 insertions, 26 deletions
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 99cf5b0e8ea6..642028867d69 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -100,7 +100,7 @@ SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFi
SetStyle( GetStyle() | WB_NOPOINTERFOCUS | WB_RECTSTYLE | WB_SMALLSTYLE );
SetModeImage( _pDlg->GetButtonImage( _nButtonId ) );
SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
- SetDropDown( PUSHBUTTON_DROPDOWN_TOOLBOX );
+ SetDropDown( PushButtonDropdownStyle::Toolbox );
}
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index bfa3f2019244..e0fc1786ba6e 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -76,9 +76,9 @@ public:
static OUString GetStandardText( StandardButtonType eButton );
- bool SetModeImage( const Image& rImage );
+ bool SetModeImage( const Image& rImage );
const Image GetModeImage( ) const;
- bool HasImage() const;
+ bool HasImage() const;
void SetImageAlign( ImageAlign eAlign );
ImageAlign GetImageAlign() const;
@@ -100,8 +100,12 @@ protected:
// - PushButton-Types -
-#define PUSHBUTTON_DROPDOWN_TOOLBOX ((sal_uInt16)0x0001)
-#define PUSHBUTTON_DROPDOWN_MENUBUTTON ((sal_uInt16)0x0002)
+enum class PushButtonDropdownStyle
+{
+ NONE = 0x0000,
+ Toolbox = 0x0001,
+ MenuButton = 0x0002,
+};
// - PushButton -
@@ -113,7 +117,7 @@ protected:
SymbolType meSymbol;
TriState meState;
TriState meSaveValue;
- sal_uInt16 mnDDStyle;
+ PushButtonDropdownStyle mnDDStyle;
bool mbPressed;
bool mbInUserDraw;
Link<> maToggleHdl;
@@ -125,7 +129,7 @@ protected:
const Rectangle& rRect, bool bLayout, bool bMenuBtnSep);
SAL_DLLPRIVATE void ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLayout = false);
using Button::ImplGetTextStyle;
- SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( sal_uLong nDrawFlags ) const;
+ SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( sal_uLong nDrawFlags ) const;
SAL_DLLPRIVATE bool IsSymbol() const { return ( (meSymbol != SymbolType::DONTKNOW) && (meSymbol != SymbolType::IMAGE) ); }
SAL_DLLPRIVATE bool IsImage() const { return Button::HasImage(); }
@@ -174,8 +178,8 @@ public:
SymbolType GetSymbol() const { return meSymbol; }
void SetSymbolAlign( SymbolAlign eAlign );
- void SetDropDown( sal_uInt16 nStyle );
- sal_uInt16 GetDropDown() const { return mnDDStyle; }
+ void SetDropDown( PushButtonDropdownStyle nStyle );
+ PushButtonDropdownStyle GetDropDown() const { return mnDDStyle; }
void SetState( TriState eState );
TriState GetState() const { return meState; }
@@ -197,7 +201,7 @@ public:
void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; }
const Link<>& GetToggleHdl() const { return maToggleHdl; }
- virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
+ virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
};
inline void PushButton::Check( bool bCheck )
@@ -278,10 +282,10 @@ private:
Rectangle maStateRect;
Rectangle maMouseRect;
Image maImage;
- bool mbChecked;
- bool mbSaveValue;
- bool mbRadioCheck;
- bool mbStateChanged;
+ bool mbChecked;
+ bool mbSaveValue;
+ bool mbRadioCheck;
+ bool mbStateChanged;
Link<> maToggleHdl;
// when mbLegacyNoTextAlign is set then the old behaviour where
// the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement
@@ -315,7 +319,7 @@ public:
SAL_DLLPRIVATE void ImplSetMinimumNWFSize();
protected:
- virtual void FillLayoutData() const SAL_OVERRIDE;
+ virtual void FillLayoutData() const SAL_OVERRIDE;
virtual const vcl::Font&
GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE;
virtual const Color&
@@ -349,7 +353,7 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- void Toggle();
+ void Toggle();
bool IsStateChanged() const { return mbStateChanged; }
@@ -435,7 +439,7 @@ protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
- virtual void FillLayoutData() const SAL_OVERRIDE;
+ virtual void FillLayoutData() const SAL_OVERRIDE;
virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE;
virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE;
@@ -463,7 +467,7 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- void Toggle();
+ void Toggle();
void SetState( TriState eState );
TriState GetState() const { return meState; }
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 175d3c717780..2e983ed1981f 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -341,7 +341,7 @@ ScExtIButton::ScExtIButton(vcl::Window* pParent, WinBits nBits )
{
nSelected=0;
aIdle.SetPriority(SchedulerPriority::LOWEST);
- SetDropDown(PUSHBUTTON_DROPDOWN_TOOLBOX);
+ SetDropDown(PushButtonDropdownStyle::Toolbox);
}
extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScExtIButton(vcl::Window *pParent, VclBuilder::stringmap &)
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 7bbe33a695a6..b036aeeece2b 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -617,7 +617,7 @@ void PushButton::ImplInitPushButtonData()
meSymbol = SymbolType::DONTKNOW;
meState = TRISTATE_FALSE;
meSaveValue = TRISTATE_FALSE;
- mnDDStyle = 0;
+ mnDDStyle = PushButtonDropdownStyle::NONE;
mbPressed = false;
mbInUserDraw = false;
}
@@ -837,7 +837,7 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice* pDev, sal_uLong nDrawFl
sal_uLong nImageSep = 1 + (pDev->GetTextHeight()-10)/2;
if( nImageSep < 1 )
nImageSep = 1;
- if ( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
+ if ( mnDDStyle == PushButtonDropdownStyle::MenuButton )
{
long nSeparatorX = 0;
Rectangle aSymbolRect = aInRect;
@@ -887,7 +887,7 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice* pDev, sal_uLong nDrawFl
aDecoView.DrawSymbol( aSymbolRect, meSymbol, aColor, nStyle );
}
- if ( mnDDStyle == PUSHBUTTON_DROPDOWN_TOOLBOX && !bLayout )
+ if ( mnDDStyle == PushButtonDropdownStyle::Toolbox && !bLayout )
{
bool bBlack = false;
Color aArrowColor( COL_BLACK );
@@ -1547,7 +1547,7 @@ void PushButton::SetSymbolAlign( SymbolAlign eAlign )
ImplSetSymbolAlign( eAlign );
}
-void PushButton::SetDropDown( sal_uInt16 nStyle )
+void PushButton::SetDropDown( PushButtonDropdownStyle nStyle )
{
if ( mnDDStyle != nStyle )
{
@@ -1613,7 +1613,7 @@ Size PushButton::CalcMinimumSize( long nMaxWidth ) const
}
else if ( IsImage() && ! (ImplGetButtonState() & BUTTON_DRAW_NOIMAGE) )
aSize = GetModeImage().GetSizePixel();
- if( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
+ if( mnDDStyle == PushButtonDropdownStyle::MenuButton )
{
long nSymbolSize = GetTextHeight() / 2 + 1;
aSize.Width() += 2*nSymbolSize;
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 74c94c23f550..9e4525690825 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -28,7 +28,7 @@
void MenuButton::ImplInitMenuButtonData()
{
- mnDDStyle = PUSHBUTTON_DROPDOWN_MENUBUTTON;
+ mnDDStyle = PushButtonDropdownStyle::MenuButton;
mpMenuTimer = NULL;
mpMenu = NULL;
@@ -109,7 +109,7 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
if ( mnMenuMode & MENUBUTTON_MENUMODE_TIMED )
{
// If the separated dropdown symbol is not hit, delay the popup execution
- if( mnDDStyle != PUSHBUTTON_DROPDOWN_MENUBUTTON || // no separator at all
+ if( mnDDStyle != PushButtonDropdownStyle::MenuButton || // no separator at all
rMEvt.GetPosPixel().X() <= ImplGetSeparatorX() )
{
if ( !mpMenuTimer )
generated by cgit (git 2.34.1) at 2024-07-30 10:33:03 +0000