diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-15 13:03:05 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-15 13:03:05 +0000 |
| commit | 38dddedf06c27bde422e0387047852daa0d06cb7 (patch) | |
| tree | a8ec630c90efeb3b24bdf91d6a996ca6c4ffddf7 /vcl | |
| parent | e52566c36c2c57f067b5664c41f6941159d6e298 (diff) | |
CWS-TOOLING: integrate CWS ooo311gsl02_DEV300
2009-05-25 16:07:55 +0200 pl r272260 : #b6843142# #i102226# do not acquire own mutex during outside UNO calls
2009-05-25 16:05:06 +0200 pl r272259 : #b6843142# #i102226# do not acquire solar mutex during UNO calls
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index bb08477e82e9..b55798608b37 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -138,8 +138,6 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event, GdkEvent*, gpointer data ) { - GTK_YIELD_GRAB(); - GdkFilterReturn aFilterReturn = GDK_FILTER_CONTINUE; XEvent *pEvent = (XEvent *)sys_event; @@ -150,6 +148,8 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event, CallEventCallback( pEvent, sizeof( XEvent ) ) ) aFilterReturn = GDK_FILTER_REMOVE; + GTK_YIELD_GRAB(); + if (pDisplay->GetDisplay() == pEvent->xany.display ) { // #i53471# gtk has no callback mechanism that lets us be notified |