include/vcl/weld.hxx | 2 +-
vcl/inc/salvtables.hxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/unx/gtk3/gtkinst.cxx | 12 ++++--------
4 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit 82b08515fafea688001ec3b77e0874ee87e44ac2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat May 15 16:35:21 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat May 15 21:42:54 2021 +0200
inherit Button from Widget instead of Container
Change-Id: Ic4f444d615e732f5d87ccde0cf10484d2ab679d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115661
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 327649375992..b0801ec0ad1d 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1365,7 +1365,7 @@ public:
bool get_value_changed_from_saved() const { return m_sSavedValue !=
get_selected_text(); }
};
-class VCL_DLLPUBLIC Button : virtual public Container
+class VCL_DLLPUBLIC Button : virtual public Widget
{
friend class ::LOKTrigger;
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 4defda33a327..8b415b998b4b 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1002,7 +1002,7 @@ public:
virtual ~SalInstanceComboBoxWithEdit() override;
};
-class SalInstanceButton : public SalInstanceContainer, public virtual
weld::Button
+class SalInstanceButton : public SalInstanceWidget, public virtual weld::Button
{
private:
VclPtr<::Button> m_xButton;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 81f46a4d446b..771517062a1e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2567,7 +2567,7 @@ IMPL_LINK_NOARG(SalInstanceVerticalNotebook,
ActivatePageHdl, VerticalTabControl
SalInstanceButton::SalInstanceButton(::Button* pButton, SalInstanceBuilder*
pBuilder,
bool bTakeOwnership)
- : SalInstanceContainer(pButton, pBuilder, bTakeOwnership)
+ : SalInstanceWidget(pButton, pBuilder, bTakeOwnership)
, m_xButton(pButton)
, m_aOldClickHdl(pButton->GetClickHdl())
{
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index ecccca2e3539..523cc5cef594 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -7575,7 +7575,7 @@ void set_font(GtkLabel* pLabel, const vcl::Font& rFont)
}
#if !GTK_CHECK_VERSION(4, 0, 0)
-class GtkInstanceButton : public GtkInstanceContainer, public virtual
weld::Button
+class GtkInstanceButton : public GtkInstanceWidget, public virtual weld::Button
{
private:
GtkButton* m_pButton;
@@ -7676,11 +7676,7 @@ protected:
public:
GtkInstanceButton(GtkButton* pButton, GtkInstanceBuilder* pBuilder, bool
bTakeOwnership)
-#if !GTK_CHECK_VERSION(4, 0, 0)
- : GtkInstanceContainer(GTK_CONTAINER(pButton), pBuilder,
bTakeOwnership)
-#else
- : GtkInstanceContainer(GTK_WIDGET(pButton), pBuilder, bTakeOwnership)
-#endif
+ : GtkInstanceWidget(GTK_WIDGET(pButton), pBuilder, bTakeOwnership)
, m_pButton(pButton)
, m_pCustomCssProvider(nullptr)
, m_nSignalId(g_signal_connect(pButton, "clicked",
G_CALLBACK(signalClicked), this))
@@ -7775,12 +7771,12 @@ public:
virtual void disable_notify_events() override
{
g_signal_handler_block(m_pButton, m_nSignalId);
- 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_pButton, m_nSignalId);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
