include/vcl/weld.hxx | 6 +++---
vcl/inc/salvtables.hxx | 6 +++---
vcl/source/app/salvtables.cxx | 12 ++++++------
vcl/unx/gtk3/gtkinst.cxx | 28 ++++++++++++++--------------
4 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 65d6dc999c3e453498a007273cea26290c720f4c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat May 15 14:33:55 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat May 15 17:08:15 2021 +0200
inherit Expander from Widget instead of Container
likewise TreeView and IconView
Change-Id: Ic51b88ba9a63706443e8a34a971168702ddce418
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115659
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index e818c96ed16f..327649375992 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -851,7 +851,7 @@ public:
button column when enable_toggle_buttons is used). Column index -1 is
reserved to access those columns.
*/
-class VCL_DLLPUBLIC TreeView : virtual public Container
+class VCL_DLLPUBLIC TreeView : virtual public Widget
{
friend class ::LOKTrigger;
@@ -1280,7 +1280,7 @@ public:
using Widget::set_sensitive;
};
-class VCL_DLLPUBLIC IconView : virtual public Container
+class VCL_DLLPUBLIC IconView : virtual public Widget
{
friend class ::LOKTrigger;
@@ -2136,7 +2136,7 @@ public:
void connect_vadjustment_changed(const Link<TextView&, void>& rLink) {
m_aVChangeHdl = rLink; }
};
-class VCL_DLLPUBLIC Expander : virtual public Container
+class VCL_DLLPUBLIC Expander : virtual public Widget
{
protected:
Link<Expander&, void> m_aExpandedHdl;
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index eb41bc4eb63e..4defda33a327 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1341,7 +1341,7 @@ struct SalInstanceTreeIter : public weld::TreeIter
SvTreeListEntry* iter;
};
-class SalInstanceTreeView : public SalInstanceContainer, public virtual
weld::TreeView
+class SalInstanceTreeView : public SalInstanceWidget, public virtual
weld::TreeView
{
protected:
// owner for UserData
@@ -1701,7 +1701,7 @@ public:
virtual ~SalInstanceTreeView() override;
};
-class SalInstanceExpander : public SalInstanceContainer, public virtual
weld::Expander
+class SalInstanceExpander : public SalInstanceWidget, public virtual
weld::Expander
{
private:
VclPtr<VclExpander> m_xExpander;
@@ -1726,7 +1726,7 @@ public:
virtual ~SalInstanceExpander() override;
};
-class SalInstanceIconView : public SalInstanceContainer, public virtual
weld::IconView
+class SalInstanceIconView : public SalInstanceWidget, public virtual
weld::IconView
{
private:
// owner for UserData
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 1eda39158975..81f46a4d446b 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3655,7 +3655,7 @@ void SalInstanceTreeView::set_header_item_width(const
std::vector<int>& rWidths)
SalInstanceTreeView::SalInstanceTreeView(SvTabListBox* pTreeView,
SalInstanceBuilder* pBuilder,
bool bTakeOwnership)
- : SalInstanceContainer(pTreeView, pBuilder, bTakeOwnership)
+ : SalInstanceWidget(pTreeView, pBuilder, bTakeOwnership)
, m_xTreeView(pTreeView)
, m_aCheckButtonData(pTreeView, false)
, m_aRadioButtonData(pTreeView, true)
@@ -3823,14 +3823,14 @@ void SalInstanceTreeView::show()
{
if (LclHeaderTabListBox* pHeaderBox =
dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()))
pHeaderBox->GetParent()->Show();
- SalInstanceContainer::show();
+ SalInstanceWidget::show();
}
void SalInstanceTreeView::hide()
{
if (LclHeaderTabListBox* pHeaderBox =
dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()))
pHeaderBox->GetParent()->Hide();
- SalInstanceContainer::hide();
+ SalInstanceWidget::hide();
}
void SalInstanceTreeView::insert(const weld::TreeIter* pParent, int pos, const
OUString* pStr,
@@ -5169,7 +5169,7 @@ IMPL_LINK(SalInstanceTreeView, EditedEntryHdl,
IterString, rIterString, bool)
SalInstanceIconView::SalInstanceIconView(::IconView* pIconView,
SalInstanceBuilder* pBuilder,
bool bTakeOwnership)
- : SalInstanceContainer(pIconView, pBuilder, bTakeOwnership)
+ : SalInstanceWidget(pIconView, pBuilder, bTakeOwnership)
, m_xIconView(pIconView)
{
m_xIconView->SetSelectHdl(LINK(this, SalInstanceIconView, SelectHdl));
@@ -5876,7 +5876,7 @@ IMPL_LINK(SalInstanceTextView, CursorListener,
VclWindowEvent&, rEvent, void)
SalInstanceExpander::SalInstanceExpander(VclExpander* pExpander,
SalInstanceBuilder* pBuilder,
bool bTakeOwnership)
- : SalInstanceContainer(pExpander, pBuilder, bTakeOwnership)
+ : SalInstanceWidget(pExpander, pBuilder, bTakeOwnership)
, m_xExpander(pExpander)
{
m_xExpander->SetExpandedHdl(LINK(this, SalInstanceExpander, ExpandedHdl));
@@ -5892,7 +5892,7 @@ void SalInstanceExpander::set_expanded(bool bExpand) {
m_xExpander->set_expanded
bool SalInstanceExpander::has_focus() const
{
- return m_xExpander->get_label_widget()->HasFocus() ||
SalInstanceContainer::has_focus();
+ return m_xExpander->get_label_widget()->HasFocus() ||
SalInstanceWidget::has_focus();
}
void SalInstanceExpander::grab_focus() { return
m_xExpander->get_label_widget()->GrabFocus(); }
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 83ad682ca9ec..ecccca2e3539 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10640,7 +10640,7 @@ int promote_arg(bool bArg)
return static_cast<int>(bArg);
}
-class GtkInstanceTreeView : public GtkInstanceContainer, public virtual
weld::TreeView
+class GtkInstanceTreeView : public GtkInstanceWidget, public virtual
weld::TreeView
{
private:
GtkTreeView* m_pTreeView;
@@ -11372,7 +11372,7 @@ private:
public:
GtkInstanceTreeView(GtkTreeView* pTreeView, GtkInstanceBuilder* pBuilder,
bool bTakeOwnership)
- : GtkInstanceContainer(GTK_CONTAINER(pTreeView), pBuilder,
bTakeOwnership)
+ : GtkInstanceWidget(GTK_WIDGET(pTreeView), pBuilder, bTakeOwnership)
, m_pTreeView(pTreeView)
, m_pTreeModel(gtk_tree_view_get_model(m_pTreeView))
, m_bWorkAroundBadDragRegion(false)
@@ -12748,7 +12748,7 @@ public:
{
disable_notify_events();
bool bIsFirstFreeze = IsFirstFreeze();
- GtkInstanceContainer::freeze();
+ GtkInstanceWidget::freeze();
if (bIsFirstFreeze)
{
g_object_ref(m_pTreeModel);
@@ -12785,7 +12785,7 @@ public:
gtk_tree_view_set_model(m_pTreeView, GTK_TREE_MODEL(m_pTreeModel));
g_object_unref(m_pTreeModel);
}
- GtkInstanceContainer::thaw();
+ GtkInstanceWidget::thaw();
enable_notify_events();
}
@@ -12879,12 +12879,12 @@ public:
g_signal_handler_block(m_pTreeModel, m_nRowDeletedSignalId);
g_signal_handler_block(m_pTreeModel, m_nRowInsertedSignalId);
- 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_pTreeModel, m_nRowDeletedSignalId);
g_signal_handler_unblock(m_pTreeModel, m_nRowInsertedSignalId);
@@ -13224,7 +13224,7 @@ IMPL_LINK_NOARG(GtkInstanceTreeView,
async_stop_cell_editing, void*, void)
namespace {
-class GtkInstanceIconView : public GtkInstanceContainer, public virtual
weld::IconView
+class GtkInstanceIconView : public GtkInstanceWidget, public virtual
weld::IconView
{
private:
GtkIconView* m_pIconView;
@@ -13345,7 +13345,7 @@ private:
public:
GtkInstanceIconView(GtkIconView* pIconView, GtkInstanceBuilder* pBuilder,
bool bTakeOwnership)
- : GtkInstanceContainer(GTK_CONTAINER(pIconView), pBuilder,
bTakeOwnership)
+ : GtkInstanceWidget(GTK_WIDGET(pIconView), pBuilder, bTakeOwnership)
, m_pIconView(pIconView)
, m_pTreeStore(GTK_TREE_STORE(gtk_icon_view_get_model(m_pIconView)))
, m_nTextCol(gtk_icon_view_get_text_column(m_pIconView))
@@ -13405,7 +13405,7 @@ public:
{
disable_notify_events();
bool bIsFirstFreeze = IsFirstFreeze();
- GtkInstanceContainer::freeze();
+ GtkInstanceWidget::freeze();
if (bIsFirstFreeze)
{
g_object_ref(m_pTreeStore);
@@ -13424,7 +13424,7 @@ public:
gtk_icon_view_set_model(m_pIconView, GTK_TREE_MODEL(m_pTreeStore));
g_object_unref(m_pTreeStore);
}
- GtkInstanceContainer::thaw();
+ GtkInstanceWidget::thaw();
enable_notify_events();
}
@@ -13613,12 +13613,12 @@ public:
g_signal_handler_block(m_pIconView, m_nSelectionChangedSignalId);
g_signal_handler_block(m_pIconView, m_nItemActivatedSignalId);
- 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_pIconView, m_nItemActivatedSignalId);
g_signal_handler_unblock(m_pIconView, m_nSelectionChangedSignalId);
@@ -17253,7 +17253,7 @@ public:
}
};
-class GtkInstanceExpander : public GtkInstanceContainer, public virtual
weld::Expander
+class GtkInstanceExpander : public GtkInstanceWidget, public virtual
weld::Expander
{
private:
GtkExpander* m_pExpander;
@@ -17303,7 +17303,7 @@ private:
public:
GtkInstanceExpander(GtkExpander* pExpander, GtkInstanceBuilder* pBuilder,
bool bTakeOwnership)
- : GtkInstanceContainer(GTK_CONTAINER(pExpander), pBuilder,
bTakeOwnership)
+ : GtkInstanceWidget(GTK_WIDGET(pExpander), pBuilder, bTakeOwnership)
, m_pExpander(pExpander)
, m_nSignalId(g_signal_connect(m_pExpander, "notify::expanded",
G_CALLBACK(signalExpanded), this))
, m_nButtonPressEventSignalId(g_signal_connect_after(m_pExpander,
"button-press-event", G_CALLBACK(signalButton), this))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
