Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix creating wxGLCanvas without any attributes in wxMSW

Browse Source 
This was broken by the changes of
f0e67ed517, see #16402.

Just check that we do have the attributes before examining them.

(cherry picked from commit 74421a7f35)
This commit is contained in:
Vadim Zeitlin
2014-08-15 12:14:06 +00:00
committed by Dimitri Schoolwerth
parent 12d9c4ea9d
commit 8675f35fc8
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/glcanvas.cpp
View File

@@ -321,25 +321,28 @@ bool wxGLCanvas::Create(wxWindow *parent,
glVersionMinor = 0; glVersionMinor = 0;
// Check for a core profile request // Check for a core profile request
for ( int i = 0; attribList[i]; ) if ( attribList )
{ {
switch ( attribList[i++] ) for ( int i = 0; attribList[i]; )
{ {
case WX_GL_CORE_PROFILE: switch ( attribList[i++] )
useGLCoreProfile = true; {
break; case WX_GL_CORE_PROFILE:
useGLCoreProfile = true;
break;
case WX_GL_MAJOR_VERSION: case WX_GL_MAJOR_VERSION:
glVersionMajor = attribList[i++]; glVersionMajor = attribList[i++];
break; break;
case WX_GL_MINOR_VERSION: case WX_GL_MINOR_VERSION:
glVersionMinor = attribList[i++]; glVersionMinor = attribList[i++];
break; break;
default: default:
// ignore all other flags for now // ignore all other flags for now
break; break;
}
} }
} }