FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Protecting some preprocessor symbols that are not defined in OpenGL-ES per e-mail from Vincent R dated 5:37 AM, October 3, 2009.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@833 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2009-11-02 13:42:23 +00:00
parent baf772ecb7
commit 2bebcfa23f
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/src/freeglut_main.c
View File

@ -1735,7 +1735,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
* XXX WM_MOUSELEAVE code set it to false. Then when we get a WM_MOUSEMOVE event, * XXX WM_MOUSELEAVE code set it to false. Then when we get a WM_MOUSEMOVE event,
* XXX if the flag is false we invoke the Entry callback and set the flag to true. * XXX if the flag is false we invoke the Entry callback and set the flag to true.
*/ */
case 0x02a2: /* This is the message we get when the mouse is leaving the window */ case 0x02a3: /* This is the message we get when the mouse is leaving the window */
if( window->IsMenu && if( window->IsMenu &&
window->ActiveMenu && window->ActiveMenu->IsActive ) window->ActiveMenu && window->ActiveMenu->IsActive )
fgUpdateMenuHighlight( window->ActiveMenu ); fgUpdateMenuHighlight( window->ActiveMenu );

28
freeglut/freeglut/src/freeglut_state.c
View File

@ -364,16 +364,28 @@ int FGAPIENTRY glutGet( GLenum eWhat )
/* Handle the OpenGL inquiries */ /* Handle the OpenGL inquiries */
case GLUT_WINDOW_RGBA: case GLUT_WINDOW_RGBA:
#if defined(_WIN32_WCE)
boolValue = (GLboolean)0; /* WinCE doesn't support this feature */
#else
glGetBooleanv ( GL_RGBA_MODE, &boolValue ); glGetBooleanv ( GL_RGBA_MODE, &boolValue );
returnValue = boolValue ? 1 : 0; returnValue = boolValue ? 1 : 0;
#endif
return returnValue; return returnValue;
case GLUT_WINDOW_DOUBLEBUFFER: case GLUT_WINDOW_DOUBLEBUFFER:
#if defined(_WIN32_WCE)
boolValue = (GLboolean)0; /* WinCE doesn't support this feature */
#else
glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue ); glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue );
returnValue = boolValue ? 1 : 0; returnValue = boolValue ? 1 : 0;
#endif
return returnValue; return returnValue;
case GLUT_WINDOW_STEREO: case GLUT_WINDOW_STEREO:
#if defined(_WIN32_WCE)
boolValue = (GLboolean)0; /* WinCE doesn't support this feature */
#else
glGetBooleanv ( GL_STEREO, &boolValue ); glGetBooleanv ( GL_STEREO, &boolValue );
returnValue = boolValue ? 1 : 0; returnValue = boolValue ? 1 : 0;
#endif
return returnValue; return returnValue;
case GLUT_WINDOW_RED_SIZE: case GLUT_WINDOW_RED_SIZE:
@ -389,16 +401,32 @@ int FGAPIENTRY glutGet( GLenum eWhat )
glGetIntegerv ( GL_ALPHA_BITS, &returnValue ); glGetIntegerv ( GL_ALPHA_BITS, &returnValue );
return returnValue; return returnValue;
case GLUT_WINDOW_ACCUM_RED_SIZE: case GLUT_WINDOW_ACCUM_RED_SIZE:
#if defined(_WIN32_WCE)
returnValue = 0; /* WinCE doesn't support this feature */
#else
glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue ); glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue );
#endif
return returnValue; return returnValue;
case GLUT_WINDOW_ACCUM_GREEN_SIZE: case GLUT_WINDOW_ACCUM_GREEN_SIZE:
#if defined(_WIN32_WCE)
returnValue = 0; /* WinCE doesn't support this feature */
#else
glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue ); glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue );
#endif
return returnValue; return returnValue;
case GLUT_WINDOW_ACCUM_BLUE_SIZE: case GLUT_WINDOW_ACCUM_BLUE_SIZE:
#if defined(_WIN32_WCE)
returnValue = 0; /* WinCE doesn't support this feature */
#else
glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue ); glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue );
#endif
return returnValue; return returnValue;
case GLUT_WINDOW_ACCUM_ALPHA_SIZE: case GLUT_WINDOW_ACCUM_ALPHA_SIZE:
#if defined(_WIN32_WCE)
returnValue = 0; /* WinCE doesn't support this feature */
#else
glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue ); glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue );
#endif
return returnValue; return returnValue;
case GLUT_WINDOW_DEPTH_SIZE: case GLUT_WINDOW_DEPTH_SIZE:
glGetIntegerv ( GL_DEPTH_BITS, &returnValue ); glGetIntegerv ( GL_DEPTH_BITS, &returnValue );