include/vcl/weld.hxx | 2 +- vcl/inc/salvtables.hxx | 2 +- vcl/source/app/salvtables.cxx | 2 +- vcl/unx/gtk3/gtkinst.cxx | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 5b0deaba0067143b20948b8efe0eea5937aaa3df Author: Caolán McNamara <[email protected]> AuthorDate: Fri May 14 21:10:53 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat May 15 15:26:29 2021 +0200 inherit TextView from Widget instead of Container Change-Id: Ic8ad23beaa6a3c2de74cb554f9b9c5aea6a78639 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115637 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 03ec14dc1a8a..e818c96ed16f 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -2062,7 +2062,7 @@ public: virtual void set_font_color(const Color& rColor) = 0; }; -class VCL_DLLPUBLIC TextView : virtual public Container +class VCL_DLLPUBLIC TextView : virtual public Widget { friend class ::LOKTrigger; diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index dc48a8d66695..eb41bc4eb63e 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -1263,7 +1263,7 @@ public: virtual ~SalInstanceToolbar() override; }; -class SalInstanceTextView : public SalInstanceContainer, public virtual weld::TextView +class SalInstanceTextView : public SalInstanceWidget, public virtual weld::TextView { private: VclPtr<VclMultiLineEdit> m_xTextView; diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 4d4a418408c1..1eda39158975 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -5714,7 +5714,7 @@ std::unique_ptr<weld::Label> SalInstanceFrame::weld_label_widget() const SalInstanceTextView::SalInstanceTextView(VclMultiLineEdit* pTextView, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceContainer(pTextView, pBuilder, bTakeOwnership) + : SalInstanceWidget(pTextView, pBuilder, bTakeOwnership) , m_xTextView(pTextView) { m_xTextView->SetModifyHdl(LINK(this, SalInstanceTextView, ChangeHdl)); diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 2af11bbf477b..83ad682ca9ec 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -14150,7 +14150,7 @@ std::unique_ptr<weld::Label> GtkInstanceFrame::weld_label_widget() const namespace { -class GtkInstanceTextView : public GtkInstanceContainer, public virtual weld::TextView +class GtkInstanceTextView : public GtkInstanceWidget, public virtual weld::TextView { private: GtkTextView* m_pTextView; @@ -14241,7 +14241,7 @@ private: public: GtkInstanceTextView(GtkTextView* pTextView, GtkInstanceBuilder* pBuilder, bool bTakeOwnership) - : GtkInstanceContainer(GTK_CONTAINER(pTextView), pBuilder, bTakeOwnership) + : GtkInstanceWidget(GTK_WIDGET(pTextView), pBuilder, bTakeOwnership) , m_pTextView(pTextView) , m_pTextBuffer(gtk_text_view_get_buffer(pTextView)) , m_pVAdjustment(gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(pTextView))) @@ -14363,12 +14363,12 @@ public: g_signal_handler_block(m_pVAdjustment, m_nVAdjustChangedSignalId); g_signal_handler_block(m_pTextBuffer, m_nCursorPosSignalId); g_signal_handler_block(m_pTextBuffer, m_nChangedSignalId); - GtkInstanceContainer::disable_notify_events(); + GtkInstanceWidget::disable_notify_events(); } virtual void enable_notify_events() override { - GtkInstanceContainer::enable_notify_events(); + GtkInstanceWidget::enable_notify_events(); g_signal_handler_unblock(m_pTextBuffer, m_nChangedSignalId); g_signal_handler_unblock(m_pTextBuffer, m_nCursorPosSignalId); g_signal_handler_unblock(m_pVAdjustment, m_nVAdjustChangedSignalId); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
