diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 09:21:53 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:11:34 +0000 |
commit | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (patch) | |
tree | efbfb952f3236a6f56540ddae6a896c8c73774a0 /include/vcl/button.hxx | |
parent | f12e483589888f87843026ceff5ae3c1e615ca02 (diff) |
Formatting changes across all modules
+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs
Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/vcl/button.hxx')
-rw-r--r-- | include/vcl/button.hxx | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 9665dfd10ea1..2cea4564235c 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -37,6 +37,7 @@ class UserDrawEvent; class ImplCommonButtonData; enum class DrawButtonFlags; + class VCL_DLLPUBLIC Button : public Control { private: @@ -103,9 +104,6 @@ protected: }; -// - PushButton-Types - - - enum class PushButtonDropdownStyle { NONE = 0x0000, @@ -114,9 +112,6 @@ enum class PushButtonDropdownStyle }; -// - PushButton - - - class VCL_DLLPUBLIC PushButton : public Button { protected: @@ -207,16 +202,19 @@ public: virtual void ShowFocus(const Rectangle& rRect) override; }; + inline void PushButton::Check( bool bCheck ) { SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE ); } + inline bool PushButton::IsChecked() const { return (GetState() == TRISTATE_TRUE); } + class VCL_DLLPUBLIC OKButton : public PushButton { protected: @@ -233,6 +231,7 @@ public: virtual void Click() override; }; + class VCL_DLLPUBLIC CancelButton : public PushButton { protected: @@ -249,6 +248,7 @@ public: virtual void Click() override; }; + class VCL_DLLPUBLIC CloseButton : public CancelButton { public: @@ -256,10 +256,6 @@ public: }; - -// - HelpButton - - - class VCL_DLLPUBLIC HelpButton : public PushButton { protected: @@ -277,7 +273,6 @@ public: }; -// - RadioButton - class VCL_DLLPUBLIC RadioButton : public Button { private: @@ -404,9 +399,6 @@ public: }; -// - CheckBox - - - class VCL_DLLPUBLIC CheckBox : public Button { private: @@ -495,24 +487,24 @@ public: virtual void ShowFocus(const Rectangle& rRect) override; }; + inline void CheckBox::Check( bool bCheck ) { SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE ); } + inline bool CheckBox::IsChecked() const { return (GetState() == TRISTATE_TRUE); } -// - Control-Layer fuer alten Code - - - class VCL_DLLPUBLIC ImageButton : public PushButton { protected: using PushButton::ImplInitStyle; + private: SAL_DLLPRIVATE void ImplInitStyle(); @@ -524,6 +516,7 @@ public: ImageButton( vcl::Window* pParent, const ResId& rResId ); }; + class VCL_DLLPUBLIC ImageRadioButton : public RadioButton { ImageRadioButton( const ImageRadioButton & ) = delete; @@ -533,6 +526,7 @@ public: explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 ); }; + class VCL_DLLPUBLIC TriStateBox : public CheckBox { TriStateBox( const TriStateBox & ) = delete; @@ -542,10 +536,12 @@ public: explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 ); }; + class VCL_DLLPUBLIC DisclosureButton : public CheckBox { protected: SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override; + public: explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 ); |