diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:42:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:42:45 +0000 |
| commit | 4152f517d744b6ea0298659cd306951219c3caca (patch) | |
| tree | ddc02e0e372d476cb50a7e514f63cb0f4f5f0ab7 /vcl | |
| parent | e147039977794bf73dcb3288d8358a9adf496671 (diff) | |
INTEGRATION: CWS canvas05 (1.80.6); FILE MERGED
2008/06/18 21:51:45 thb 1.80.6.2: #i10000# Fixed tinderbox build breakage
2008/04/28 23:19:32 thb 1.80.6.1: Passing along screen ptr with SystemData objects
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 1f5f79cde543..fbf6a53038f3 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gtkframe.cxx,v $ - * $Revision: 1.81 $ + * $Revision: 1.82 $ * * This file is part of OpenOffice.org. * @@ -587,6 +587,7 @@ void GtkSalFrame::InitCommon() m_aSystemData.pSalFrame = this; m_aSystemData.pWidget = m_pWindow; m_aSystemData.pVisual = pDisp->GetVisual( m_nScreen ).GetVisual(); + m_aSystemData.nScreen = m_nScreen; m_aSystemData.nDepth = pDisp->GetVisual( m_nScreen ).GetDepth(); m_aSystemData.aColormap = pDisp->GetColormap( m_nScreen ).GetXColormap(); m_aSystemData.pAppContext = NULL; |