diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-11 12:05:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-11 22:18:01 +0200 |
| commit | 5dfc4fd2af11322dfbface30fd66c1ce553a0703 (patch) | |
| tree | c3fad34763839cabf487a8e432ede52641737700 /vcl | |
| parent | 86c1b5ff8f66747a3d4cebe6e2e0d1892db9ba9a (diff) | |
weld ScDbNameDlg
Change-Id: I676909cbb4067ce69d5327403dd25cc80c4cbc4b
Reviewed-on: https://gerrit.libreoffice.org/70593
Tested-by: Jenkins
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 | 10 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 431aa0c1904e..310254b1cfeb 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1236,6 +1236,8 @@ public: { return m_xFrame->get_label(); } + + virtual std::unique_ptr<weld::Label> weld_label_widget() const override; }; class SalInstanceScrolledWindow : public SalInstanceContainer, public virtual weld::ScrolledWindow @@ -3774,6 +3776,14 @@ public: } }; +std::unique_ptr<weld::Label> SalInstanceFrame::weld_label_widget() const +{ + FixedText* pLabel = dynamic_cast<FixedText*>(m_xFrame->get_label_widget()); + if (!pLabel) + return nullptr; + return std::make_unique<SalInstanceLabel>(pLabel, m_pBuilder, false); +} + class SalInstanceTextView : public SalInstanceContainer, public virtual weld::TextView { private: diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 1747184c3ac1..19a3ed29edc4 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -3128,6 +3128,8 @@ public: const gchar* pStr = gtk_frame_get_label(m_pFrame); return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); } + + virtual std::unique_ptr<weld::Label> weld_label_widget() const override; }; static GType crippled_viewport_get_type(); @@ -7540,6 +7542,14 @@ public: } }; +std::unique_ptr<weld::Label> GtkInstanceFrame::weld_label_widget() const +{ + GtkWidget* pLabel = gtk_frame_get_label_widget(m_pFrame); + if (!pLabel || !GTK_IS_LABEL(pLabel)) + return nullptr; + return std::make_unique<GtkInstanceLabel>(GTK_LABEL(pLabel), m_pBuilder, false); +} + class GtkInstanceTextView : public GtkInstanceContainer, public virtual weld::TextView { private: |