Removed redundant code.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@669 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/ChangeLog b/ChangeLog
index 8b2a0e2..e90f285 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1103,3 +1103,5 @@ anymore, fixing a space leak. Not perfect for menus yet...
 (286) X11 only: Destroy the global menu rendering context when
 deinitializing. The visual/context handling for menus is still rather
 obscure, though...
+
+(287) Removed redundant code.

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index c6d9c73..a953316 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -1085,7 +1085,6 @@ void FGAPIENTRY glutMainLoopEvent( void )
         case UnmapNotify:
             /* We get this when iconifying a window. */ 
             GETWINDOW( xunmap );
-            fgSetWindow( window );
             INVOKE_WCB( *window, WindowStatus, ( GLUT_HIDDEN ) );
             window->State.Visible = GL_FALSE;
             break;
@@ -1100,14 +1099,6 @@ void FGAPIENTRY glutMainLoopEvent( void )
 
         case VisibilityNotify:
         {
-            GETWINDOW( xvisibility );
-            /*
-             * XXX INVOKE_WCB() does this check for us.
-             */
-            if( ! FETCH_WCB( *window, WindowStatus ) )
-                break;
-            fgSetWindow( window );
-
             /*
              * Sending this event, the X server can notify us that the window
              * has just acquired one of the three possible visibility states:
@@ -1116,6 +1107,7 @@ void FGAPIENTRY glutMainLoopEvent( void )
              * VisibilityNotify event when iconifying a window, we only get an
              * UnmapNotify then.
              */
+            GETWINDOW( xvisibility );
             switch( event.xvisibility.state )
             {
             case VisibilityUnobscured: