From df8f780cc24410d2fec5c4d4e1ed58d492559241 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 22 Jul 2020 15:19:26 +0100 Subject: move useful parts of ControlBase down hierarchy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4116a3532b21f6066468bd3905efef1020ace101 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99233 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- include/vcl/InterimItemWindow.hxx | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/vcl/InterimItemWindow.hxx') diff --git a/include/vcl/InterimItemWindow.hxx b/include/vcl/InterimItemWindow.hxx index 2ff2dd6d2303..2e2a259a2077 100644 --- a/include/vcl/InterimItemWindow.hxx +++ b/include/vcl/InterimItemWindow.hxx @@ -23,10 +23,16 @@ public: virtual Size GetOptimalSize() const override; virtual void GetFocus() override; + bool ControlHasFocus() const; + + virtual void Draw(OutputDevice* pDevice, const Point& rPos, DrawFlags nFlags) override; + protected: InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, sal_uInt64 nLOKWindowId = 0); + void InitControlBase(weld::Widget* pWidget); + // pass keystrokes from our child window through this to handle focus changes correctly // returns true if keystroke is consumed bool ChildKeyInput(const KeyEvent& rKEvt); @@ -34,6 +40,10 @@ protected: std::unique_ptr m_xBuilder; VclPtr m_xVclContentArea; std::unique_ptr m_xContainer; + weld::Widget* m_pWidget; + +private: + virtual void ImplPaintToDevice(::OutputDevice* pTargetOutDev, const Point& rPos) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ -- cgit