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

some cleanup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1585 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2013-04-04 10:36:44 +00:00
parent c387bfee98
commit 753f2f1163
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freeglut/freeglut/src/fg_menu.c
View File

@ -213,10 +213,10 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu )
} }
menu->ActiveEntry = menuEntry; menu->ActiveEntry = menuEntry;
menu->IsActive = GL_TRUE; /* XXX Do we need this? */ menu->IsActive = GL_TRUE;
/* /*
* OKi, we have marked that entry as active, but it would be also * OK, we have marked that entry as active, but it would be also
* nice to have its contents updated, in case it's a sub menu. * nice to have its contents updated, in case it's a sub menu.
* Also, ignore the return value of the check function: * Also, ignore the return value of the check function:
*/ */
@ -633,15 +633,6 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
/* Could reopen again in different location, as is_clicked remains false */ /* Could reopen again in different location, as is_clicked remains false */
} }
/*
* XXX Why does an active menu require a redisplay at
* XXX this point? If this can come out cleanly, then
* XXX it probably should do so; if not, a comment should
* XXX explain it.
*/
if( ! window->IsMenu )
window->State.Redisplay = GL_TRUE;
is_handled = GL_TRUE; is_handled = GL_TRUE;
} }
@ -659,8 +650,6 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
if (window->State.MouseX>0 && window->State.MouseY>0 && if (window->State.MouseX>0 && window->State.MouseY>0 &&
window->State.MouseX<window->State.Width && window->State.MouseY<window->State.Height) window->State.MouseX<window->State.Width && window->State.MouseY<window->State.Height)
{ {
/* XXX Posting a requisite Redisplay seems bogus. */
window->State.Redisplay = GL_TRUE;
fghActivateMenu( window, button ); fghActivateMenu( window, button );
is_handled = GL_TRUE; is_handled = GL_TRUE;
} }

4
freeglut/freeglut/src/fg_state.c
View File

@ -61,9 +61,6 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
{ {
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" );
/*
* XXX In chronological code add order. (WHY in that order?)
*/
switch( eWhat ) switch( eWhat )
{ {
case GLUT_INIT_WINDOW_X: case GLUT_INIT_WINDOW_X:
@ -161,7 +158,6 @@ int FGAPIENTRY glutGet( GLenum eWhat )
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" );
/* XXX In chronological code add order. (WHY in that order?) */
switch( eWhat ) switch( eWhat )
{ {
/* Following values are stored in fgState and fgDisplay global structures */ /* Following values are stored in fgState and fgDisplay global structures */

3
freeglut/freeglut/src/mswin/fg_init_mswin.c
View File

@ -57,9 +57,6 @@ void fgPlatformInitialize( const char* displayName )
* Each of the windows should have its own device context, and we * Each of the windows should have its own device context, and we
* want redraw events during Vertical and Horizontal Resizes by * want redraw events during Vertical and Horizontal Resizes by
* the user. * the user.
*
* XXX Old code had "| CS_DBCLCKS" commented out. Plans for the
* XXX future? Dead-end idea?
*/ */
wc.lpfnWndProc = fgPlatformWindowProc; wc.lpfnWndProc = fgPlatformWindowProc;
wc.cbClsExtra = 0; wc.cbClsExtra = 0;