diff options
Diffstat (limited to 'include/vcl/button.hxx')
-rw-r--r-- | include/vcl/button.hxx | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index ea1af74d6157..7e3cf2f315e0 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -65,7 +65,7 @@ protected: public: virtual ~Button(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void Click(); @@ -89,7 +89,7 @@ public: void SetFocusRect( const Rectangle& rFocusRect ); bool IsSmallSymbol() const; void SetSmallSymbol(bool bSmall = true); - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; protected: @@ -150,27 +150,27 @@ public: protected: explicit PushButton( WindowType nType ); - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; public: explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 ); explicit PushButton( vcl::Window* pParent, const ResId& ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void KeyUp( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Toggle(); @@ -195,10 +195,10 @@ public: bool IsValueChangedFromSaved() const { return meSaveValue != GetState(); } Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - virtual void ShowFocus(const Rectangle& rRect) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual void ShowFocus(const Rectangle& rRect) override; }; inline void PushButton::Check( bool bCheck ) @@ -224,7 +224,7 @@ private: public: explicit OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON ); - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; }; class VCL_DLLPUBLIC CancelButton : public PushButton @@ -240,7 +240,7 @@ private: public: explicit CancelButton( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; }; class VCL_DLLPUBLIC CloseButton : public CancelButton @@ -267,7 +267,7 @@ private: public: explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; }; @@ -316,11 +316,11 @@ public: SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); protected: - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; } @@ -333,20 +333,20 @@ public: explicit RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 ); explicit RadioButton( vcl::Window* pParent, const ResId& ); virtual ~RadioButton(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void KeyUp( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Toggle(); @@ -369,7 +369,7 @@ public: static Image GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<RadioButton&,void>& rLink ) { maToggleHdl = rLink; } @@ -388,13 +388,13 @@ public: */ std::vector<VclPtr<RadioButton> > GetRadioButtonGroup(bool bIncludeThis = true) const; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; /* * Group this RadioButton with another */ void group(RadioButton &rOther); - virtual void ShowFocus(const Rectangle& rRect) SAL_OVERRIDE; + virtual void ShowFocus(const Rectangle& rRect) override; }; @@ -434,9 +434,9 @@ 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 const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + virtual void FillLayoutData() const override; + virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const override; + virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; } @@ -449,18 +449,18 @@ public: explicit CheckBox( vcl::Window* pParent, WinBits nStyle = 0 ); explicit CheckBox( vcl::Window* pParent, const ResId& ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void KeyUp( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Toggle(); @@ -480,13 +480,13 @@ public: static Image GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<CheckBox&,void>& rLink ) { maToggleHdl = rLink; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - virtual void ShowFocus(const Rectangle& rRect) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual void ShowFocus(const Rectangle& rRect) override; }; inline void CheckBox::Check( bool bCheck ) @@ -539,11 +539,11 @@ public: class VCL_DLLPUBLIC DisclosureButton : public CheckBox { protected: - SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override; public: explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; }; #endif // INCLUDED_VCL_BUTTON_HXX |