diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 11:09:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 11:09:22 +0000 |
| commit | e42a985febccd4128c6be39c583c71ff7f437465 (patch) | |
| tree | cd9d4838fc44d905b93079f6f33ce0a90f57499e /vcl | |
| parent | 435022c9c1da049a541e34001128f4eb45a00433 (diff) | |
INTEGRATION: CWS vcl30 (1.10.60); FILE MERGED
2004/11/03 17:57:21 pl 1.10.60.1: #i36582# make bean work again
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index f007abb94db1..f9ae75f46987 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gtkdata.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2004-11-09 16:45:49 $ + * last change: $Author: obo $ $Date: 2004-11-15 12:09:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,8 +112,8 @@ using namespace rtl; ***************************************************************************/ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay, Visual* pVis, Colormap aCol ) - : m_pGdkDisplay( pDisplay ), - SalDisplay( gdk_x11_display_get_xdisplay( pDisplay ), aCol ) + : SalDisplay( gdk_x11_display_get_xdisplay( pDisplay ), aCol ), + m_pGdkDisplay( pDisplay ) { for(int i = 0; i < POINTER_COUNT; i++) m_aCursors[ i ] = NULL; @@ -165,9 +165,9 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event, it != pDisplay->m_aFrames.end(); ++it ) { GtkSalFrame* pFrame = static_cast<GtkSalFrame*>(*it); - if( pFrame->GetSystemData()->aWindow == pEvent->xany.window || - ( pFrame->getForeignParent() && GDK_WINDOW_XWINDOW(pFrame->getForeignParent()) == pEvent->xany.window ) || - ( pFrame->getForeignTopLevel() && GDK_WINDOW_XWINDOW(pFrame->getForeignTopLevel()) == pEvent->xany.window ) + if( (GdkNativeWindow)pFrame->GetSystemData()->aWindow == pEvent->xany.window || + ( pFrame->getForeignParent() && pFrame->getForeignParentWindow() == pEvent->xany.window ) || + ( pFrame->getForeignTopLevel() && pFrame->getForeignTopLevelWindow() == pEvent->xany.window ) ) { if( ! pFrame->Dispatch( pEvent ) ) @@ -189,7 +189,7 @@ long GtkSalDisplay::Dispatch( XEvent* pEvent ) for( std::list< SalFrame* >::const_iterator it = m_aFrames.begin(); it != m_aFrames.end(); ++it ) { - if( (*it)->GetSystemData()->aWindow == pEvent->xany.window ) + if( (GdkNativeWindow)(*it)->GetSystemData()->aWindow == pEvent->xany.window ) return static_cast<GtkSalFrame*>(*it)->Dispatch( pEvent ); } } |