diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-26 16:53:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-27 11:22:49 +0100 |
| commit | 082e69fefb7439fd4f3d543f0c402039e94c1e9c (patch) | |
| tree | 8348cacdc54a15dae722b93fc198995756924fc0 /vcl/unx | |
| parent | f41a08183504a59d6ffc7a00ed7f24e6b19995ab (diff) | |
convert various MessBox to weld::MessageDialog
Change-Id: I4d2d0393c753114aeb9bb7e646dfdc810f6caa38
Reviewed-on: https://gerrit.libreoffice.org/50398
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.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index feec34bf58ea..e31606fffbad 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1158,6 +1158,12 @@ class GtkInstanceBuilder; namespace { + void set_help_id(const GtkWidget *pWidget, const OString& rHelpId) + { + gchar *helpid = g_strdup(rHelpId.getStr()); + g_object_set_data_full(G_OBJECT(pWidget), "helpid", helpid, g_free); + } + OString get_help_id(const GtkWidget *pWidget) { void* pData = g_object_get_data(G_OBJECT(pWidget), "helpid"); @@ -1274,6 +1280,11 @@ public: return OString(pStr, pStr ? strlen(pStr) : 0); } + virtual void set_help_id(const OString& rHelpId) override + { + ::set_help_id(m_pWidget, rHelpId); + } + virtual OString get_help_id() const override { OString sRet = ::get_help_id(m_pWidget); @@ -2462,8 +2473,7 @@ namespace if (!nLen) return; OString sHelpId = *pHelpRoot + OString(pStr, nLen); - gchar *helpid = g_strdup(sHelpId.getStr()); - g_object_set_data_full(pObject, "helpid", helpid, g_free); + set_help_id(pWidget, sHelpId); //hook up for extended help const ImplSVData* pSVData = ImplGetSVData(); if (pSVData->maHelpData.mbBalloonHelp) |