[Libreoffice-commits] core.git: vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 10 14:56:05 UTC 2019
vcl/unx/gtk3/gtk3gtkinst.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 935f50bd13b4acfff5bb8e4f67ddd64861790fd8
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 10 14:34:17 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 10 16:54:35 2019 +0200
'close' is available for GtkDialog and GtkAssistant
Change-Id: I7d9d74d2399160a603dc66e2006b4ebe9627873c
Reviewed-on: https://gerrit.libreoffice.org/80612
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index eacb188ebee8..67cf394bf345 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3914,7 +3914,6 @@ public:
: GtkInstanceWindow(pDialog, pBuilder, bTakeOwnership)
, m_pDialog(pDialog)
, m_aDialogRun(pDialog, this)
- , m_nCloseSignalId(g_signal_connect(m_pDialog, "close", G_CALLBACK(signalClose), this))
, m_nResponseSignalId(0)
, m_nCancelSignalId(0)
, m_nSignalDeleteId(0)
@@ -3923,6 +3922,10 @@ public:
, m_nOldEditWidthReq(0)
, m_nOldBorderWidth(0)
{
+ if (GTK_IS_DIALOG(m_pDialog) || GTK_IS_ASSISTANT(m_pDialog))
+ m_nCloseSignalId = g_signal_connect(m_pDialog, "close", G_CALLBACK(signalClose), this);
+ else
+ m_nCloseSignalId = 0;
const bool bScreenshotMode(officecfg::Office::Common::Misc::ScreenshotMode::get());
if (bScreenshotMode)
{
More information about the Libreoffice-commits
mailing list