src/freeglut_main.c:816 and :1571, set the current window (John F. Fay)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@159 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
sandalle 2003-08-05 15:16:12 +00:00
parent 139cfcc8a2
commit 9be4444627
2 changed files with 16 additions and 0 deletions

View File

@ -257,3 +257,9 @@ October 24, 2002:
(96) src/freeglut_window.c:551 Removed extra carriage return for Windows users (John F. Fay) (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)

View File

@ -814,6 +814,11 @@ void FGAPIENTRY glutMainLoopEvent( void )
*/ */
if( fgStructure.Window->Callbacks.Mouse == NULL ) if( fgStructure.Window->Callbacks.Mouse == NULL )
break; break;
/*
* Set the current window
*/
fgSetWindow ( window );
/* /*
* Remember the current modifiers state * Remember the current modifiers state
@ -1570,6 +1575,11 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
( ( (GetKeyState( VK_LCONTROL ) < 0 ) || ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | ( ( (GetKeyState( VK_LCONTROL ) < 0 ) || ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
( ( (GetKeyState( VK_LMENU ) < 0 ) || ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); ( ( (GetKeyState( VK_LMENU ) < 0 ) || ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
/*
* Set the current window
*/
fgSetWindow ( window );
/* /*
* Finally execute the mouse callback * Finally execute the mouse callback
*/ */