summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-18 14:26:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-18 21:39:04 +0200
commitdc7f9a1f79a94107d6113ee6569dbcbf15cf3071 (patch)
treec9f034876d744958782d49088daf9ff26bed968e /vcl/unx
parent40c3b5dee84b419efcbc1efc1020d1c07332d670 (diff)
weld SwCreateAuthEntryDlg_Impl
Change-Id: Ib654539cca64efe479cf3c9b8b585ab17019edeb Reviewed-on: https://gerrit.libreoffice.org/53117 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx47
1 files changed, 35 insertions, 12 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 4c273766bde0..14e8af024d01 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1319,6 +1319,26 @@ public:
return nAttach;
}
+ virtual void set_hexpand(bool bExpand) override
+ {
+ gtk_widget_set_hexpand(m_pWidget, bExpand);
+ }
+
+ virtual bool get_hexpand() const override
+ {
+ return gtk_widget_get_hexpand(m_pWidget);
+ }
+
+ virtual void set_vexpand(bool bExpand) override
+ {
+ gtk_widget_set_vexpand(m_pWidget, bExpand);
+ }
+
+ virtual bool get_vexpand() const override
+ {
+ return gtk_widget_get_vexpand(m_pWidget);
+ }
+
virtual void set_margin_top(int nMargin) override
{
gtk_widget_set_margin_top(m_pWidget, nMargin);
@@ -1621,18 +1641,19 @@ public:
{
}
- virtual void remove(weld::Widget* pWidget) override
- {
- GtkInstanceWidget* pGtkWidget = dynamic_cast<GtkInstanceWidget*>(pWidget);
- assert(pGtkWidget);
- gtk_container_remove(m_pContainer, pGtkWidget->getWidget());
- }
+ GtkContainer* getContainer() { return m_pContainer; }
- virtual void add(weld::Widget* pWidget) override
+ virtual void move(weld::Widget* pWidget, weld::Container* pNewParent) override
{
GtkInstanceWidget* pGtkWidget = dynamic_cast<GtkInstanceWidget*>(pWidget);
assert(pGtkWidget);
- gtk_container_add(m_pContainer, pGtkWidget->getWidget());
+ GtkInstanceContainer* pNewGtkParent = dynamic_cast<GtkInstanceContainer*>(pNewParent);
+ assert(pNewGtkParent);
+ GtkWidget* pChild = pGtkWidget->getWidget();
+ g_object_ref(pChild);
+ gtk_container_remove(getContainer(), pChild);
+ gtk_container_add(pNewGtkParent->getContainer(), pChild);
+ g_object_unref(pChild);
}
};
@@ -2917,8 +2938,6 @@ public:
enable_notify_events();
}
- using GtkInstanceContainer::remove;
-
virtual void remove(int pos) override
{
disable_notify_events();
@@ -3268,6 +3287,12 @@ public:
{
return ::get_label(m_pLabel);
}
+
+ virtual void set_mnemonic_widget(Widget* pTarget) override
+ {
+ GtkInstanceWidget* pTargetWidget = dynamic_cast<GtkInstanceWidget*>(pTarget);
+ gtk_label_set_mnemonic_widget(m_pLabel, pTargetWidget ? pTargetWidget->getWidget() : nullptr);
+ }
};
class GtkInstanceTextView : public GtkInstanceContainer, public virtual weld::TextView
@@ -3801,8 +3826,6 @@ public:
enable_notify_events();
}
- using GtkInstanceContainer::remove;
-
virtual void remove(int pos) override
{
disable_notify_events();