From: Eric Sandall Date: Tue, 5 Aug 2003 15:16:12 +0000 (+0000) Subject: src/freeglut_main.c:816 and :1571, set the current window (John F. Fay) X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;ds=inline;h=109729efbd7429be55cab0d73097e792447971a2;p=freeglut src/freeglut_main.c:816 and :1571, set the current window (John F. Fay) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@159 7f0cb862-5218-0410-a997-914c9d46530a --- diff --git a/ChangeLog b/ChangeLog index 2bb8206..3fbb653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -257,3 +257,9 @@ October 24, 2002: (96) src/freeglut_window.c:551 Removed extra carriage return for Windows users (John F. Fay) + +******************************************************************************************* +* Changes on 05 August 2003 +******************************************************************************************* + +(97) src/freeglut_main.c:816 and :1571, set the current window (John F. Fay) diff --git a/src/freeglut_main.c b/src/freeglut_main.c index 858116a..50dd5e4 100644 --- a/src/freeglut_main.c +++ b/src/freeglut_main.c @@ -814,6 +814,11 @@ void FGAPIENTRY glutMainLoopEvent( void ) */ if( fgStructure.Window->Callbacks.Mouse == NULL ) break; + /* + * Set the current window + */ + fgSetWindow ( window ); + /* * Remember the current modifiers state @@ -1571,6 +1576,11 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara ( ( (GetKeyState( VK_LMENU ) < 0 ) || ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); /* + * Set the current window + */ + fgSetWindow ( window ); + + /* * Finally execute the mouse callback */ fgStructure.Window->Callbacks.Mouse(