summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk/window/gtkobject.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-10-06 09:00:15 +0000
committerKurt Zenker <kz@openoffice.org>2006-10-06 09:00:15 +0000
commit223a568a77026dfd15e68c50b873321938d57c60 (patch)
tree40ac787b03f6d9b35cd1be2e5d4e665c2296ec1e /vcl/unx/gtk/window/gtkobject.cxx
parentf8f24ded29e87bbbe4f8265fad746096b1a311ad (diff)
INTEGRATION: CWS impresshydra (1.8.46); FILE MERGED
2006/09/20 13:45:28 cl 1.8.46.3: RESYNC: (1.9-1.10); FILE MERGED 2006/08/28 13:06:53 cl 1.8.46.2: RESYNC: (1.8-1.9); FILE MERGED 2006/08/09 14:35:04 pl 1.8.46.1: #i67721# on the way to multiscreen support
Diffstat (limited to 'vcl/unx/gtk/window/gtkobject.cxx')
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index f737efd6064d..2cffdd6c1c9c 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: gtkobject.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 12:30:31 $
+ * last change: $Author: kz $ $Date: 2006-10-06 10:00:15 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -67,9 +67,9 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent )
m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pSocket->window);
m_aSystemData.pSalFrame = NULL;
m_aSystemData.pWidget = m_pSocket;
- m_aSystemData.pVisual = pDisp->GetVisual()->GetVisual();
- m_aSystemData.nDepth = pDisp->GetVisual()->GetDepth();
- m_aSystemData.aColormap = pDisp->GetColormap().GetXColormap();
+ m_aSystemData.pVisual = pDisp->GetVisual(pParent->getScreenNumber()).GetVisual();
+ m_aSystemData.nDepth = pDisp->GetVisual(pParent->getScreenNumber()).GetDepth();
+ m_aSystemData.aColormap = pDisp->GetColormap(pParent->getScreenNumber()).GetXColormap();
m_aSystemData.pAppContext = NULL;
m_aSystemData.aShellWindow = GDK_WINDOW_XWINDOW(GTK_WIDGET(pParent->getWindow())->window);
m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow());