diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 15:21:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 15:21:11 +0000 |
| commit | e9cb118e6e98eb13b3ad1901c8c912bed674f096 (patch) | |
| tree | fdb60128ea249fac3eb01db7bcf8b8b0989f1528 | |
| parent | add7b140b7c79b57218d4f7bd80716d940debdfd (diff) | |
INTEGRATION: CWS vcl85_SRC680 (1.71.70); FILE MERGED
2008/01/16 12:13:53 obr 1.71.70.3: #i78117# need to skip the frame window UNO accessible in any case
2007/12/21 13:06:39 pl 1.71.70.2: RESYNC: (1.71-1.72); FILE MERGED
2007/12/13 15:30:31 pl 1.71.70.1: #i80791# use correct owner events parameter in SetPointer
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index e75a6604aedf..9818dd7b6e62 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gtkframe.cxx,v $ * - * $Revision: 1.73 $ + * $Revision: 1.74 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 16:24:00 $ + * last change: $Author: rt $ $Date: 2008-01-29 16:21:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -749,30 +749,6 @@ GtkSalFrame::GetAtkRole( GtkWindow* window ) return role; } - -// FIXME: rename as appropriate -uno::Reference< accessibility::XAccessible > -GtkSalFrame::getAccessible( bool bCreate ) -{ - // Yes - this is a hack - but: this abstraction seems totally useless to me - Window *pWindow = GetWindow(); - - g_return_val_if_fail( pWindow != NULL, NULL ); - - // skip the border window accessible - if( pWindow->GetType() == WINDOW_BORDERWINDOW ) - { - pWindow = pWindow->GetAccessibleChildWindow( 0 ); - g_return_val_if_fail( pWindow != NULL, NULL ); - } - // replace the top-level role Dialog with something more appropriate .. - else if( pWindow->GetAccessibleRole() == accessibility::AccessibleRole::ALERT || - pWindow->GetAccessibleRole() == accessibility::AccessibleRole::DIALOG ) - pWindow->SetAccessibleRole(accessibility::AccessibleRole::OPTION_PANE); - - return pWindow->GetAccessible( bCreate ); -} - void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle ) { if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style @@ -1956,7 +1932,10 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle ) gdk_window_set_cursor( GTK_WIDGET(m_pWindow)->window, pCursor ); m_pCurrentCursor = pCursor; - if( getDisplay()->MouseCaptured( this ) || m_nFloats > 0 ) + // #i80791# use grabPointer the same way as CaptureMouse, respective float grab + if( getDisplay()->MouseCaptured( this ) ) + grabPointer( TRUE, FALSE ); + else if( m_nFloats > 0 ) grabPointer( TRUE, TRUE ); } } |