argh, some debug code made it in (don't commit and then make changes to
the file before its fully transmitted...) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1357 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
2be86de619
commit
662a168536
@ -495,7 +495,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
|
|||||||
case WM_KILLFOCUS:
|
case WM_KILLFOCUS:
|
||||||
{
|
{
|
||||||
SFG_Menu* menu = NULL;
|
SFG_Menu* menu = NULL;
|
||||||
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 ) );
|
||||||
|
|
||||||
@ -511,34 +511,16 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
|
|||||||
{
|
{
|
||||||
SFG_Window* wnd = NULL;
|
SFG_Window* wnd = NULL;
|
||||||
HWND hwnd = GetFocus(); /* Get window with current focus - NULL for non freeglut windows */
|
HWND hwnd = GetFocus(); /* Get window with current focus - NULL for non freeglut windows */
|
||||||
printf(" hwnd: %p\n",hwnd);
|
|
||||||
if (hwnd)
|
if (hwnd)
|
||||||
/* See which of our windows it is */
|
/* See which of our windows it is */
|
||||||
wnd = fgWindowByHandle(hwnd);
|
wnd = fgWindowByHandle(hwnd);
|
||||||
|
|
||||||
//printf(" got menu: %p\n",menu);
|
|
||||||
|
|
||||||
printf(" wnd: %p, wnd->AM->PW: %p, menu->PW: %p\n",wnd,wnd&&wnd->ActiveMenu?wnd->ActiveMenu->ParentWindow:0,menu->ParentWindow);
|
|
||||||
if (wnd)
|
|
||||||
printf(" wnd menu: %i, wnd->ActiveMenu: %p, wnd->Parent: %p\n",wnd->IsMenu,wnd->ActiveMenu,wnd->Parent);
|
|
||||||
|
|
||||||
if (!hwnd || !wnd)
|
if (!hwnd || !wnd)
|
||||||
{
|
|
||||||
/* User switched to another application*/
|
/* User switched to another application*/
|
||||||
fgDeactivateMenu(menu->ParentWindow);
|
fgDeactivateMenu(menu->ParentWindow);
|
||||||
printf(" -> kill1\n");
|
|
||||||
}
|
|
||||||
else if (!wnd->IsMenu && wnd!=menu->ParentWindow)
|
else if (!wnd->IsMenu && wnd!=menu->ParentWindow)
|
||||||
{
|
|
||||||
/* User switched to another FreeGLUT window */
|
/* User switched to another FreeGLUT window */
|
||||||
fgDeactivateMenu(menu->ParentWindow);
|
fgDeactivateMenu(menu->ParentWindow);
|
||||||
printf(" -> kill2\n");
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf(" -> survive\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user