From a2e0d9e66235abc1e9d555ffb7ba0903d85c0581 Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Thu, 4 Apr 2013 10:36:44 +0000 Subject: [PATCH] some cleanup git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1585 7f0cb862-5218-0410-a997-914c9d46530a --- src/fg_menu.c | 15 ++------------- src/fg_state.c | 4 ---- src/mswin/fg_init_mswin.c | 3 --- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/fg_menu.c b/src/fg_menu.c index b1bc04d..38e2495 100644 --- a/src/fg_menu.c +++ b/src/fg_menu.c @@ -213,10 +213,10 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) } 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. * 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 */ } - /* - * 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; } @@ -659,8 +650,6 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, if (window->State.MouseX>0 && window->State.MouseY>0 && window->State.MouseXState.Width && window->State.MouseYState.Height) { - /* XXX Posting a requisite Redisplay seems bogus. */ - window->State.Redisplay = GL_TRUE; fghActivateMenu( window, button ); is_handled = GL_TRUE; } diff --git a/src/fg_state.c b/src/fg_state.c index 6a9387d..458941f 100644 --- a/src/fg_state.c +++ b/src/fg_state.c @@ -61,9 +61,6 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" ); - /* - * XXX In chronological code add order. (WHY in that order?) - */ switch( eWhat ) { case GLUT_INIT_WINDOW_X: @@ -161,7 +158,6 @@ int FGAPIENTRY glutGet( GLenum eWhat ) FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" ); - /* XXX In chronological code add order. (WHY in that order?) */ switch( eWhat ) { /* Following values are stored in fgState and fgDisplay global structures */ diff --git a/src/mswin/fg_init_mswin.c b/src/mswin/fg_init_mswin.c index 40a4c7e..9822f8c 100644 --- a/src/mswin/fg_init_mswin.c +++ b/src/mswin/fg_init_mswin.c @@ -57,9 +57,6 @@ void fgPlatformInitialize( const char* displayName ) * Each of the windows should have its own device context, and we * want redraw events during Vertical and Horizontal Resizes by * the user. - * - * XXX Old code had "| CS_DBCLCKS" commented out. Plans for the - * XXX future? Dead-end idea? */ wc.lpfnWndProc = fgPlatformWindowProc; wc.cbClsExtra = 0; -- 1.7.10.4