strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS canvas05 (1.224.8); FILE MERGED

Browse source 
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
This commit is contained in:
Kurt Zenker 2008-06-24 10:46:02 +00:00
parent fa7171f71e
commit 2fec8f86f4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vcl/unx/source/window/salframe.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: salframe.cxx,v $ * $RCSfile: salframe.cxx,v $
* $Revision: 1.224 $ * $Revision: 1.225 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -873,6 +873,7 @@ const SystemChildData* X11SalFrame::GetSystemData() const
pFrame->maSystemChildData.pSalFrame = pFrame; pFrame->maSystemChildData.pSalFrame = pFrame;
pFrame->maSystemChildData.pWidget = NULL; pFrame->maSystemChildData.pWidget = NULL;
pFrame->maSystemChildData.pVisual = GetDisplay()->GetVisual( m_nScreen ).GetVisual(); pFrame->maSystemChildData.pVisual = GetDisplay()->GetVisual( m_nScreen ).GetVisual();
pFrame->maSystemChildData.nScreen = m_nScreen;
pFrame->maSystemChildData.nDepth = GetDisplay()->GetVisual( m_nScreen ).GetDepth(); pFrame->maSystemChildData.nDepth = GetDisplay()->GetVisual( m_nScreen ).GetDepth();
pFrame->maSystemChildData.aColormap = GetDisplay()->GetColormap( m_nScreen ).GetXColormap(); pFrame->maSystemChildData.aColormap = GetDisplay()->GetColormap( m_nScreen ).GetXColormap();
pFrame->maSystemChildData.pAppContext = NULL; pFrame->maSystemChildData.pAppContext = NULL;