diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-08-27 20:27:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-08-28 21:11:15 +0200 |
| commit | e508b33fcc3619063cf00daa6c0dc191d4046174 (patch) | |
| tree | d2e32cd5e87e3a12b3ce10a2ae78b77efae8e35b | |
| parent | e3aad392609d50d7535c9f3228878a5a0fb1984a (diff) | |
move FixedLine into toolkit only headers
Change-Id: Id92cf1d685559665562d979d70662319ff4b36d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101504
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/vcl/fixed.hxx | 29 | ||||
| -rw-r--r-- | include/vcl/toolkit/fixed.hxx | 29 |
2 files changed, 29 insertions, 29 deletions
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index da96bf79d2af..4dcce65a73e4 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -72,35 +72,6 @@ public: vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; -class VCL_DLLPUBLIC FixedLine final : public Control -{ -private: - using Control::ImplInitSettings; - using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); - - virtual void FillLayoutData() const override; - virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const override; - virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; - -public: - explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); - - virtual void ApplySettings(vcl::RenderContext&) override; - - virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; - virtual void Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override; - virtual void Resize() override; - virtual void StateChanged( StateChangedType nType ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - - virtual Size GetOptimalSize() const override; -}; - class VCL_DLLPUBLIC FixedImage : public Control { private: diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx index 5e495101d71f..9383f6103b9a 100644 --- a/include/vcl/toolkit/fixed.hxx +++ b/include/vcl/toolkit/fixed.hxx @@ -35,6 +35,35 @@ public: virtual void ApplySettings(vcl::RenderContext&) override; }; +class VCL_DLLPUBLIC FixedLine final : public Control +{ +private: + using Control::ImplInitSettings; + using Window::ImplInit; + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); + + virtual void FillLayoutData() const override; + virtual const vcl::Font& + GetCanonicalFont( const StyleSettings& _rStyle ) const override; + virtual const Color& + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; + +public: + explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); + + virtual void ApplySettings(vcl::RenderContext&) override; + + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + + virtual Size GetOptimalSize() const override; +}; + class VCL_DLLPUBLIC FixedBitmap final : public Control { private: |