diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 19:00:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 19:00:38 +0000 |
| commit | 30fa6d3a8cfb3bf39c90d39c8fed8325a029bac6 (patch) | |
| tree | f11877f709571eb96988d6d1f09f278f48a271a1 /vcl/win | |
| parent | 6fb9dc683a767cce8d9871e032a7fbe25090d815 (diff) | |
INTEGRATION: CWS warnings01 (1.6.70); FILE MERGED
2006/03/20 18:20:10 pl 1.6.70.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salogl.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/win/source/gdi/salogl.cxx b/vcl/win/source/gdi/salogl.cxx index 13d4baf05dc1..d764375dbed6 100644 --- a/vcl/win/source/gdi/salogl.cxx +++ b/vcl/win/source/gdi/salogl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salogl.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 14:06:22 $ + * last change: $Author: hr $ $Date: 2006-06-19 20:00:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -135,7 +135,7 @@ bool WinSalOpenGL::IsValid() { if( ImplInitLib() ) { - USHORT nBitCount = GetDeviceCaps( mhOGLLastDC, BITSPIXEL ); + int nBitCount = GetDeviceCaps( mhOGLLastDC, BITSPIXEL ); PIXELFORMATDESCRIPTOR pfd = { sizeof( PIXELFORMATDESCRIPTOR ), @@ -210,12 +210,12 @@ void WinSalOpenGL::Release() // ------------------------------------------------------------------------ -void* WinSalOpenGL::GetOGLFnc( const char* pFncName ) +oglFunction WinSalOpenGL::GetOGLFnc( const char* pFncName ) { if ( hImplOGLLib ) { OUString queryFuncName = OUString::createFromAscii( pFncName ); - return (void*)osl_getSymbol( hImplOGLLib, queryFuncName.pData ); + return (oglFunction)osl_getSymbol( hImplOGLLib, queryFuncName.pData ); } else return NULL; @@ -237,7 +237,7 @@ void WinSalOpenGL::OGLEntry( SalGraphics* pSGraphics ) 1, PFD_DRAW_TO_WINDOW | PFD_SUPPORT_GDI | PFD_SUPPORT_OPENGL, PFD_TYPE_RGBA, - GetDeviceCaps( pGraphics->mhDC, BITSPIXEL ), + (BYTE)GetDeviceCaps( pGraphics->mhDC, BITSPIXEL ), 0, 0, 0, 0, 0, 0, 0, 0, @@ -281,13 +281,13 @@ void WinSalOpenGL::OGLEntry( SalGraphics* pSGraphics ) // ------------------------------------------------------------------------ -void WinSalOpenGL::OGLExit( SalGraphics* pGraphics ) +void WinSalOpenGL::OGLExit( SalGraphics* ) { } // ------------------------------------------------------------------------ -void WinSalOpenGL::StartScene( SalGraphics* pGraphics ) +void WinSalOpenGL::StartScene( SalGraphics* ) { } |