diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-01 20:21:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-02 17:08:16 +0100 |
| commit | d8a3741e0e3aa2fed6e3e16fae8eac095356c8bf (patch) | |
| tree | b3fc743a22d8adc46773914d83acf45f463cb4f2 /vcl | |
| parent | dab9a2b60a63530638905bd26162946a9494f93b (diff) | |
weld split cells dialog
Change-Id: I726c6d84807ab3efba509058eed554fe4c0ffced
Reviewed-on: https://gerrit.libreoffice.org/50636
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 20 | ||||
| -rw-r--r-- | vcl/source/control/fixed.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 28 |
3 files changed, 49 insertions, 1 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 8f8be139261a..c1a968db3cc8 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -268,6 +268,26 @@ public: return m_xWidget->GetHelpId(); } + virtual void set_grid_left_attach(int nAttach) override + { + m_xWidget->set_grid_left_attach(nAttach); + } + + virtual int get_grid_left_attach() const override + { + return m_xWidget->get_grid_left_attach(); + } + + virtual void set_grid_top_attach(int nAttach) override + { + m_xWidget->set_grid_top_attach(nAttach); + } + + virtual int get_grid_top_attach() const override + { + return m_xWidget->get_grid_top_attach(); + } + virtual weld::Container* weld_parent() const override; virtual ~SalInstanceWidget() override diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 4b212fa61912..f998285abc1a 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -972,7 +972,7 @@ Image FixedImage::loadThemeImage(const OUString &rFileName) bool FixedImage::set_property(const OString &rKey, const OUString &rValue) { - if (rKey == "pixbuf") + if (rKey == "pixbuf" || rKey == "icon-name") { SetImage(loadThemeImage(rValue)); } diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 39d68f110c5a..dfe9c89cabea 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1272,6 +1272,34 @@ public: return Size(nWidth, nHeight); } + virtual void set_grid_left_attach(int nAttach) override + { + GtkContainer* pParent = GTK_CONTAINER(gtk_widget_get_parent(m_pWidget)); + gtk_container_child_set(pParent, m_pWidget, "left-attach", nAttach, nullptr); + } + + virtual int get_grid_left_attach() const override + { + GtkContainer* pParent = GTK_CONTAINER(gtk_widget_get_parent(m_pWidget)); + gint nAttach(0); + gtk_container_child_get(pParent, m_pWidget, "left-attach", &nAttach, nullptr); + return nAttach; + } + + virtual void set_grid_top_attach(int nAttach) override + { + GtkContainer* pParent = GTK_CONTAINER(gtk_widget_get_parent(m_pWidget)); + gtk_container_child_set(pParent, m_pWidget, "top-attach", nAttach, nullptr); + } + + virtual int get_grid_top_attach() const override + { + GtkContainer* pParent = GTK_CONTAINER(gtk_widget_get_parent(m_pWidget)); + gint nAttach(0); + gtk_container_child_get(pParent, m_pWidget, "top-attach", &nAttach, nullptr); + return nAttach; + } + virtual weld::Container* weld_parent() const override; virtual OString get_buildable_name() const override |