summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-24 10:42:57 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-24 10:42:57 +0000
commitca9649aafc01c50bb02c213a480667ebeb0f5b23 (patch)
tree77ff5cfe6055769814d39572f791619aa71c362c /vcl/unx/gtk
parent4152f517d744b6ea0298659cd306951219c3caca (diff)
INTEGRATION: CWS canvas05 (1.13.8); FILE MERGED
2008/06/18 21:51:45 thb 1.13.8.2: #i10000# Fixed tinderbox build breakage 2008/04/28 23:19:32 thb 1.13.8.1: Passing along screen ptr with SystemData objects
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index aa8c69afa1d6..171be0c41f81 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gtkobject.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
* This file is part of OpenOffice.org.
*
@@ -64,6 +64,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow )
m_aSystemData.pSalFrame = NULL;
m_aSystemData.pWidget = m_pSocket;
m_aSystemData.pVisual = pDisp->GetVisual(pParent->getScreenNumber()).GetVisual();
+ m_aSystemData.nScreen = pParent->getScreenNumber();
m_aSystemData.nDepth = pDisp->GetVisual(pParent->getScreenNumber()).GetDepth();
m_aSystemData.aColormap = pDisp->GetColormap(pParent->getScreenNumber()).GetXColormap();
m_aSystemData.pAppContext = NULL;