diff options
| author | Kurt Zenker <kz@openoffice.org> | 2003-11-18 13:33:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2003-11-18 13:33:34 +0000 |
| commit | e76e7a97d65c8f582de150818839b8ec964b0221 (patch) | |
| tree | 7c8cf7ebd644ac3fc18b7f72f2db960043f12301 /vcl | |
| parent | 783fb2dd42643b95681368f169a0cdca8d622d90 (diff) | |
INTEGRATION: CWS vclplug (1.5.162); FILE MERGED
2003/10/22 13:49:42 pl 1.5.162.2: #21232# removed SalGraphicsLayout, functionality now in SalGraphics itself
2003/10/21 15:53:14 pl 1.5.162.1: #i21232# first round of virtualizing the Sal classes, Unix works, Windows to come
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/opengl.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/vcl/source/gdi/opengl.cxx b/vcl/source/gdi/opengl.cxx index 7fb53ae6c60f..d674e147ca0a 100644 --- a/vcl/source/gdi/opengl.cxx +++ b/vcl/source/gdi/opengl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: opengl.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2003-04-28 17:09:40 $ + * last change: $Author: kz $ $Date: 2003-11-18 14:33:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,12 @@ #ifndef _SV_SALGDI_HXX #include <salgdi.hxx> #endif +#ifndef _SV_SVDATA_HXX +#include <svdata.hxx> +#endif +#ifndef _SV_SALINST_HXX +#include <salinst.hxx> +#endif #include <svapp.hxx> @@ -419,9 +425,9 @@ void OpenGL::ImplInit() #ifndef REMOTE_APPSERVER if( ( PGRAPHICS || mpOutDev->ImplGetGraphics() ) && ! mbNoOGL ) { - mpOGL = new SalOpenGL( PGRAPHICS ); + mpOGL = ImplGetSVData()->mpDefInst->CreateSalOpenGL( PGRAPHICS ); - if ( !mpOGL->Create() || (!bImplOpenGLFncPtrInitialized && !ImplInitFncPointers()) ) + if ( !mpOGL->IsValid() || (!bImplOpenGLFncPtrInitialized && !ImplInitFncPointers()) ) { delete mpOGL; mpOGL = NULL; @@ -625,7 +631,7 @@ void OpenGL::Viewport( GLint nX, GLint nY, GLsizei nWidth, GLsizei nHeight ) { long lx = nX + mpOutDev->mnOutOffX; long lwidth = nWidth; - ((SalGraphicsLayout*)mpOutDev->mpGraphics)->mirror( lx, lwidth, mpOutDev ); + mpOutDev->mpGraphics->mirror( lx, lwidth, mpOutDev ); nX = lx - mpOutDev->mnOutOffX; } pImplOpenGLFncViewport( nX + mpOutDev->mnOutOffX, @@ -1523,7 +1529,7 @@ void OpenGL::Scissor( GLint nX, GLint nY, GLsizei nWidth, GLsizei nHeight ) { long lx = nX + mpOutDev->mnOutOffX; long lwidth = nWidth; - ((SalGraphicsLayout*)mpOutDev->mpGraphics)->mirror( lx, lwidth, mpOutDev ); + mpOutDev->mpGraphics->mirror( lx, lwidth, mpOutDev ); nX = lx - mpOutDev->mnOutOffX; } pImplOpenGLFncScissor( nX + mpOutDev->mnOutOffX, |