diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-21 15:27:17 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:58 +0100 |
| commit | 12b3f6a9d8ebb994f974b3ea906502c3ed5c326d (patch) | |
| tree | dca692e125ad8114c0b7cad7aa914512f519d004 /vcl | |
| parent | a07e8231a5cd3e12f7120486098479ab6ae6bcc2 (diff) | |
gtk3: add some missing SolarMutexGuards (thanks to mst for noticing)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/a11y/atkwindow.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index 2cedf59eaea2..6970f0d45953 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -30,6 +30,7 @@ #include "precompiled_vcl.hxx" #include <unx/gtk/gtkframe.hxx> +#include <vcl/svapp.hxx> #include <vcl/window.hxx> #include "vcl/popupmenuwindow.hxx" @@ -131,6 +132,7 @@ init_from_window( AtkObject *accessible, Window *pWindow ) static gint ooo_window_wrapper_clear_focus(gpointer) { + SolarMutexGuard aGuard; atk_focus_tracker_notify( NULL ); return FALSE; } diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index ad417f1ccc28..b50f85978692 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -880,6 +880,7 @@ gboolean GtkData::userEventFn( gpointer data ) extern "C" { static gboolean call_userEventFn( void *data ) { + SolarMutexGuard aGuard; return GtkData::userEventFn( data ); } } diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 3ab7840d0c39..87d1f490f624 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -3219,6 +3219,8 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f extern "C" { gboolean implDelayedFullScreenHdl (void *pWindow) { + SolarMutexGuard aGuard; + /* #i110881# workaround a gtk issue (see https://bugzilla.redhat.com/show_bug.cgi?id=623191#c8) gtk_window_fullscreen can fail due to a race condition, |