diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-01 09:32:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-01 09:32:35 +0000 |
| commit | ad8b710afd9585c040f39d9fddf54a36496b5512 (patch) | |
| tree | 7ceb3d26880a868720b586600d08bf7494e4c03c /vcl | |
| parent | f1b13466d93b39dd006f85bed4ed9009401ef89e (diff) | |
INTEGRATION: CWS vcl42 (1.9.186); FILE MERGED
2005/10/06 06:32:49 pl 1.9.186.2: RESYNC: (1.9-1.10); FILE MERGED
2005/08/08 12:10:52 pl 1.9.186.1: #i52777# remove ugly hack
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/opengl.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vcl/source/gdi/opengl.cxx b/vcl/source/gdi/opengl.cxx index b418e213ee93..fa2f93c8f976 100644 --- a/vcl/source/gdi/opengl.cxx +++ b/vcl/source/gdi/opengl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: opengl.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:05:25 $ + * last change: $Author: kz $ $Date: 2005-11-01 10:32:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,11 +33,8 @@ * ************************************************************************/ -#define private public #include <svsys.h> #include <window.hxx> -#undef private -#define private public #ifndef _SV_OUTDEV_HXX #include <outdev.hxx> @@ -544,7 +541,7 @@ void OpenGL::Viewport( GLint nX, GLint nY, GLsizei nWidth, GLsizei nHeight ) long nOutHeight; if( mpOutDev->GetOutDevType() == OUTDEV_WINDOW ) - nOutHeight = ( (Window*) mpOutDev )->mpWindowImpl->mpFrameWindow->mnOutHeight; + nOutHeight = ( (Window*) mpOutDev )->ImplGetFrameWindow()->mnOutHeight; else nOutHeight = mpOutDev->mnOutHeight; @@ -1264,7 +1261,7 @@ void OpenGL::Scissor( GLint nX, GLint nY, GLsizei nWidth, GLsizei nHeight ) long nOutHeight; if( mpOutDev->GetOutDevType() == OUTDEV_WINDOW ) - nOutHeight = ( (Window*) mpOutDev )->mpWindowImpl->mpFrameWindow->mnOutHeight; + nOutHeight = ( (Window*) mpOutDev )->ImplGetFrameWindow()->mnOutHeight; else nOutHeight = mpOutDev->mnOutHeight; |