diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-02-23 13:42:55 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-27 22:18:22 +0100 |
commit | cfe41185bc8514949d1938ee1d7cd56968682510 (patch) | |
tree | 8d990aae964cf0ed6ed49c06a86133057481ae7d /include | |
parent | 3e1306c283c2aca372a8384801a1e206f208e1cb (diff) |
weld LicenseDialogImpl
Change-Id: I4b2dbd2446779e7179d2b79bf81cc2ff879377bf
Reviewed-on: https://gerrit.libreoffice.org/68389
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/charwin.hxx | 2 | ||||
-rw-r--r-- | include/svtools/valueset.hxx | 4 | ||||
-rw-r--r-- | include/svx/charmap.hxx | 6 | ||||
-rw-r--r-- | include/svx/connctrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/dialcontrol.hxx | 6 | ||||
-rw-r--r-- | include/svx/dlgctrl.hxx | 4 | ||||
-rw-r--r-- | include/svx/frmsel.hxx | 2 | ||||
-rw-r--r-- | include/svx/measctrl.hxx | 2 | ||||
-rw-r--r-- | include/vcl/customweld.hxx | 12 | ||||
-rw-r--r-- | include/vcl/layout.hxx | 21 | ||||
-rw-r--r-- | include/vcl/vclmedit.hxx | 4 | ||||
-rw-r--r-- | include/vcl/weld.hxx | 45 |
12 files changed, 65 insertions, 45 deletions
diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx index 2dd88b7e33e1..2915c7b05ed1 100644 --- a/include/sfx2/charwin.hxx +++ b/include/sfx2/charwin.hxx @@ -42,7 +42,7 @@ private: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; - virtual void MouseButtonDown(const MouseEvent&) override; + virtual bool MouseButtonDown(const MouseEvent&) override; virtual void GetFocus() override; virtual void LoseFocus() override; virtual bool KeyInput(const KeyEvent&) override; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index da25780b02cd..5ebc98267b72 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -478,8 +478,8 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; - virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual bool MouseMove( const MouseEvent& rMEvt ) override; virtual bool KeyInput( const KeyEvent& rKEvt ) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void GetFocus() override; diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index d4a5caa941dc..b513f1ab593b 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -112,9 +112,9 @@ private: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; - virtual void MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void MouseMove(const MouseEvent& rMEvt) override; - virtual void MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual void GetFocus() override; virtual void LoseFocus() override; virtual bool KeyInput(const KeyEvent&) override; diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index 45cc99588d4f..bafcc6c892e8 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -60,7 +60,7 @@ public: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Resize() override; - virtual void MouseButtonDown(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; void SetAttributes( const SfxItemSet& rInAttrs ); sal_uInt16 GetLineDeltaCount(); diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 6c8be018e053..7a15736372cf 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -149,9 +149,9 @@ public: virtual void StyleUpdated() override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; - virtual void MouseMove( const MouseEvent& rMEvt ) override; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual bool MouseMove( const MouseEvent& rMEvt ) override; + virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override; virtual bool KeyInput(const KeyEvent& rKEvt) override; virtual void LoseFocus() override; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 08cb40dea074..de0d65259c50 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -113,7 +113,7 @@ public: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; virtual void Resize() override; - virtual void MouseButtonDown(const MouseEvent&) override; + virtual bool MouseButtonDown(const MouseEvent&) override; virtual bool KeyInput(const KeyEvent&) override; virtual void GetFocus() override; virtual void LoseFocus() override; @@ -178,7 +178,7 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Resize() override; virtual tools::Rectangle GetFocusRect() override; diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 99816c6086a7..7e3bdcdf73dc 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -180,7 +180,7 @@ public: protected: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; virtual bool KeyInput( const KeyEvent& rKEvt ) override; virtual void GetFocus() override; virtual void LoseFocus() override; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index db1380f6a34f..77eba3d8c818 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -45,7 +45,7 @@ public: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; - virtual void MouseButtonDown(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; void SetAttributes(const SfxItemSet& rInAttrs); }; diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx index 5399d6c79c41..db60521a195d 100644 --- a/include/vcl/customweld.hxx +++ b/include/vcl/customweld.hxx @@ -27,9 +27,9 @@ public: } virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) = 0; virtual void Resize() {} - virtual void MouseButtonDown(const MouseEvent&) {} - virtual void MouseMove(const MouseEvent&) {} - virtual void MouseButtonUp(const MouseEvent&) {} + virtual bool MouseButtonDown(const MouseEvent&) { return false; } + virtual bool MouseMove(const MouseEvent&) { return false; } + virtual bool MouseButtonUp(const MouseEvent&) { return false; } virtual void GetFocus() {} virtual void LoseFocus() {} virtual void StyleUpdated() { Invalidate(); } @@ -94,9 +94,9 @@ private: DECL_LINK(DoResize, const Size& rSize, void); DECL_LINK(DoPaint, weld::DrawingArea::draw_args, void); - DECL_LINK(DoMouseButtonDown, const MouseEvent&, void); - DECL_LINK(DoMouseMove, const MouseEvent&, void); - DECL_LINK(DoMouseButtonUp, const MouseEvent&, void); + DECL_LINK(DoMouseButtonDown, const MouseEvent&, bool); + DECL_LINK(DoMouseMove, const MouseEvent&, bool); + DECL_LINK(DoMouseButtonUp, const MouseEvent&, bool); DECL_LINK(DoGetFocus, weld::Widget&, void); DECL_LINK(DoLoseFocus, weld::Widget&, void); DECL_LINK(DoKeyPress, const KeyEvent&, bool); diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index da4cb16f5d68..33a6db730a85 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -614,9 +614,9 @@ private: void* m_pUserData; Link<std::pair<vcl::RenderContext&, const tools::Rectangle&>, void> m_aPaintHdl; Link<const Size&, void> m_aResizeHdl; - Link<const MouseEvent&, void> m_aMousePressHdl; - Link<const MouseEvent&, void> m_aMouseMotionHdl; - Link<const MouseEvent&, void> m_aMouseReleaseHdl; + Link<const MouseEvent&, bool> m_aMousePressHdl; + Link<const MouseEvent&, bool> m_aMouseMotionHdl; + Link<const MouseEvent&, bool> m_aMouseReleaseHdl; Link<const KeyEvent&, bool> m_aKeyPressHdl; Link<const KeyEvent&, bool> m_aKeyReleaseHdl; Link<VclDrawingArea&, void> m_aStyleUpdatedHdl; @@ -633,15 +633,18 @@ private: } virtual void MouseMove(const MouseEvent& rMEvt) override { - m_aMouseMotionHdl.Call(rMEvt); + if (!m_aMouseMotionHdl.Call(rMEvt)) + Control::MouseMove(rMEvt); } virtual void MouseButtonDown(const MouseEvent& rMEvt) override { - m_aMousePressHdl.Call(rMEvt); + if (!m_aMousePressHdl.Call(rMEvt)) + Control::MouseButtonDown(rMEvt); } virtual void MouseButtonUp(const MouseEvent& rMEvt) override { - m_aMouseReleaseHdl.Call(rMEvt); + if (!m_aMouseReleaseHdl.Call(rMEvt)) + Control::MouseButtonUp(rMEvt); } virtual void KeyInput(const KeyEvent& rKEvt) override { @@ -728,15 +731,15 @@ public: { m_aResizeHdl = rLink; } - void SetMousePressHdl(const Link<const MouseEvent&, void>& rLink) + void SetMousePressHdl(const Link<const MouseEvent&, bool>& rLink) { m_aMousePressHdl = rLink; } - void SetMouseMoveHdl(const Link<const MouseEvent&, void>& rLink) + void SetMouseMoveHdl(const Link<const MouseEvent&, bool>& rLink) { m_aMouseMotionHdl = rLink; } - void SetMouseReleaseHdl(const Link<const MouseEvent&, void>& rLink) + void SetMouseReleaseHdl(const Link<const MouseEvent&, bool>& rLink) { m_aMouseReleaseHdl = rLink; } diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 1cd49adde204..0c5b0c403e95 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -97,7 +97,6 @@ protected: TextView* GetTextView() const; ExtTextEngine* GetTextEngine() const; - ScrollBar* GetVScrollBar() const; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: @@ -170,7 +169,10 @@ public: void EnableCursor( bool bEnable ); + ScrollBar& GetVScrollBar() const; + TextWindow* GetTextWindow(); + virtual FactoryFunction GetUITestFactory() const override; virtual bool set_property(const OString &rKey, const OUString &rValue) override; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 527167f2f5c8..4673da099fd6 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -71,6 +71,9 @@ protected: Link<const Size&, void> m_aSizeAllocateHdl; Link<const KeyEvent&, bool> m_aKeyPressHdl; Link<const KeyEvent&, bool> m_aKeyReleaseHdl; + Link<const MouseEvent&, bool> m_aMousePressHdl; + Link<const MouseEvent&, bool> m_aMouseMotionHdl; + Link<const MouseEvent&, bool> m_aMouseReleaseHdl; public: virtual void set_sensitive(bool sensitive) = 0; @@ -156,6 +159,24 @@ public: m_aKeyReleaseHdl = rLink; } + virtual void connect_mouse_press(const Link<const MouseEvent&, bool>& rLink) + { + assert(!m_aMousePressHdl.IsSet() || !rLink.IsSet()); + m_aMousePressHdl = rLink; + } + + virtual void connect_mouse_move(const Link<const MouseEvent&, bool>& rLink) + { + assert(!m_aMouseMotionHdl.IsSet() || !rLink.IsSet()); + m_aMouseMotionHdl = rLink; + } + + virtual void connect_mouse_release(const Link<const MouseEvent&, bool>& rLink) + { + assert(!m_aMouseReleaseHdl.IsSet() || !rLink.IsSet()); + m_aMouseReleaseHdl = rLink; + } + virtual void grab_add() = 0; virtual bool has_grab() const = 0; virtual void grab_remove() = 0; @@ -1318,8 +1339,10 @@ private: protected: Link<TextView&, void> m_aChangeHdl; + Link<TextView&, void> m_aVChangeHdl; void signal_changed() { m_aChangeHdl.Call(*this); } + void signal_vadjustment_changed() { m_aVChangeHdl.Call(*this); } public: virtual void set_text(const OUString& rText) = 0; @@ -1339,6 +1362,13 @@ public: bool get_value_changed_from_saved() const { return m_sSavedValue != get_text(); } void connect_changed(const Link<TextView&, void>& rLink) { m_aChangeHdl = rLink; } + + virtual int vadjustment_get_value() const = 0; + virtual int vadjustment_get_upper() const = 0; + virtual int vadjustment_get_lower() const = 0; + virtual int vadjustment_get_page_size() const = 0; + virtual void vadjustment_set_value(int value) = 0; + void connect_vadjustment_changed(const Link<TextView&, void>& rLink) { m_aVChangeHdl = rLink; } }; class VCL_DLLPUBLIC Expander : virtual public Container @@ -1362,9 +1392,6 @@ public: protected: Link<draw_args, void> m_aDrawHdl; - Link<const MouseEvent&, void> m_aMousePressHdl; - Link<const MouseEvent&, void> m_aMouseMotionHdl; - Link<const MouseEvent&, void> m_aMouseReleaseHdl; Link<Widget&, void> m_aStyleUpdatedHdl; Link<const Point&, bool> m_aPopupMenuHdl; Link<Widget&, tools::Rectangle> m_aGetFocusRectHdl; @@ -1377,18 +1404,6 @@ protected: public: void connect_draw(const Link<draw_args, void>& rLink) { m_aDrawHdl = rLink; } - void connect_mouse_press(const Link<const MouseEvent&, void>& rLink) - { - m_aMousePressHdl = rLink; - } - void connect_mouse_move(const Link<const MouseEvent&, void>& rLink) - { - m_aMouseMotionHdl = rLink; - } - void connect_mouse_release(const Link<const MouseEvent&, void>& rLink) - { - m_aMouseReleaseHdl = rLink; - } void connect_style_updated(const Link<Widget&, void>& rLink) { m_aStyleUpdatedHdl = rLink; } void connect_popup_menu(const Link<const Point&, bool>& rLink) { m_aPopupMenuHdl = rLink; } void connect_focus_rect(const Link<Widget&, tools::Rectangle>& rLink) |