diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-04 15:39:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-04 15:39:59 +0000 |
| commit | 75fab60239d4f45f1003a9233848fb37e5c7243f (patch) | |
| tree | ce5b1ed4bb0282dd8812d31a34cb023c272c6981 /vcl/unx | |
| parent | 290ca51fcac596518413d255c5773868de191c74 (diff) | |
INTEGRATION: CWS vcl69 (1.19.32); FILE MERGED
2006/11/16 17:00:06 pl 1.19.32.1: #i71533# revised XError handling
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/gdi/salogl.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/vcl/unx/source/gdi/salogl.cxx b/vcl/unx/source/gdi/salogl.cxx index 168099a216cf..a46867ef456e 100644 --- a/vcl/unx/source/gdi/salogl.cxx +++ b/vcl/unx/source/gdi/salogl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salogl.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2006-10-06 10:06:57 $ + * last change: $Author: rt $ $Date: 2006-12-04 16:39:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -180,19 +180,15 @@ bool X11SalOpenGL::IsValid() if( nHaveGL && ! nDoubleBuffer ) { SalDisplay* pSalDisplay = GetX11SalData()->GetDisplay(); - BOOL bPreviousState = - pSalDisplay->GetXLib()->GetIgnoreXErrors(); - pSalDisplay->GetXLib()->SetIgnoreXErrors( TRUE ); + pSalDisplay->GetXLib()->PushXErrorLevel( true ); mbHaveGLVisual = TRUE; maGLXContext = pCreateContext( mpDisplay, const_cast<XVisualInfo*>(mpVisualInfo), 0, True ); - if( pSalDisplay->GetXLib()->WasXError() ) - mbHaveGLVisual = FALSE; - else + if( ! pSalDisplay->GetXLib()->HasXErrorOccured() ) pMakeCurrent( mpDisplay, maDrawable, maGLXContext ); - if( pSalDisplay->GetXLib()->WasXError() ) + if( pSalDisplay->GetXLib()->HasXErrorOccured() ) mbHaveGLVisual = FALSE; - pSalDisplay->GetXLib()->SetIgnoreXErrors( bPreviousState ); + pSalDisplay->GetXLib()->PopXErrorLevel(); if( mbHaveGLVisual ) mnOGLState = OGL_STATE_VALID; |