From 2fec8f86f44c24a1ab0908eed9119cc577c6ef0c Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 24 Jun 2008 10:46:02 +0000 Subject: [PATCH] INTEGRATION: CWS canvas05 (1.224.8); FILE MERGED 2008/06/09 08:19:40 thb 1.224.8.2: Replaced screen ptr with screen number, which should be more reliable 2008/04/28 23:19:33 thb 1.224.8.1: Passing along screen ptr with SystemData objects --- vcl/unx/source/window/salframe.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 0a875df4a1af..e113ad4b138f 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salframe.cxx,v $ - * $Revision: 1.224 $ + * $Revision: 1.225 $ * * This file is part of OpenOffice.org. * @@ -873,6 +873,7 @@ const SystemChildData* X11SalFrame::GetSystemData() const pFrame->maSystemChildData.pSalFrame = pFrame; pFrame->maSystemChildData.pWidget = NULL; pFrame->maSystemChildData.pVisual = GetDisplay()->GetVisual( m_nScreen ).GetVisual(); + pFrame->maSystemChildData.nScreen = m_nScreen; pFrame->maSystemChildData.nDepth = GetDisplay()->GetVisual( m_nScreen ).GetDepth(); pFrame->maSystemChildData.aColormap = GetDisplay()->GetColormap( m_nScreen ).GetXColormap(); pFrame->maSystemChildData.pAppContext = NULL;