now added fix suggested by Ioannis to make menus work when an entryfunc

is defined for the window


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1365 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-07-23 09:51:34 +00:00
parent fe05157a34
commit c2266aa027

View File

@ -518,9 +518,11 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
case WM_KILLFOCUS: case WM_KILLFOCUS:
{ {
SFG_Menu* menu = NULL; SFG_Menu* menu = NULL;
SFG_Window* saved_window = fgStructure.CurrentWindow;
/* printf("WM_KILLFOCUS: %p\n", window ); */ /* printf("WM_KILLFOCUS: %p\n", window ); */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) ); INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
fgSetWindow(saved_window);
/* If we have an open menu, see if the open menu should be closed /* If we have an open menu, see if the open menu should be closed
* when focus was lost because user either switched * when focus was lost because user either switched