summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-29 21:05:22 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-06-29 21:08:02 +0100
commit1ca05e1ad6f7377a7e29ec5d74533a2d7170a628 (patch)
treec2f8f1c95aef47e925873bcf2cb2d0d8658f8e27 /vcl
parentef575c9c1bbc59c9c5f7097094433d1652d1547b (diff)
can't make the gtk3 dialogs modal for some reason, workaround the auto-popdown
Change-Id: I280408bae5d9c15c6bbc7da5f3e4ec8dd20757e8
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index c53a80be39ee..2d2ff309616a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -135,8 +135,12 @@ RunDialog::~RunDialog()
void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject& )
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
+#if !GTK_CHECK_VERSION(3,0,0)
SolarMutexGuard g;
g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, reinterpret_cast<GSourceFunc>(canceldialog), this, NULL);
+#else
+ SAL_WARN( "vcl", "ignoring windowOpened, because gtk3 dialog is probably not modal as expected and a tooltip was triggered" );
+#endif
}
void SAL_CALL RunDialog::queryTermination( const ::com::sun::star::lang::EventObject& )