From f8a0d455b4ec10096337cee040166bd006e63eef Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Sat, 21 Jul 2012 14:19:38 +0000 Subject: [PATCH 1/1] argh, some debug code made it in (don't commit and then make changes to the file before its fully transmitted...) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1357 7f0cb862-5218-0410-a997-914c9d46530a --- src/mswin/fg_main_mswin.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c index 3e1a86f..25330e8 100644 --- a/src/mswin/fg_main_mswin.c +++ b/src/mswin/fg_main_mswin.c @@ -495,7 +495,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_KILLFOCUS: { SFG_Menu* menu = NULL; - printf("WM_KILLFOCUS: %p\n", window ); +/* printf("WM_KILLFOCUS: %p\n", window ); */ lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) ); @@ -511,34 +511,16 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, { SFG_Window* wnd = NULL; HWND hwnd = GetFocus(); /* Get window with current focus - NULL for non freeglut windows */ - printf(" hwnd: %p\n",hwnd); if (hwnd) /* See which of our windows it is */ 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) - { /* User switched to another application*/ fgDeactivateMenu(menu->ParentWindow); - printf(" -> kill1\n"); - } else if (!wnd->IsMenu && wnd!=menu->ParentWindow) - { /* User switched to another FreeGLUT window */ fgDeactivateMenu(menu->ParentWindow); - printf(" -> kill2\n"); - - } - else - { - printf(" -> survive\n"); - } } } break; -- 1.7.10.4