projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
if user opens menu in parent window and then clicked child window, the menu wasn...
[freeglut]
/
src
/
mswin
/
fg_main_mswin.c
diff --git
a/src/mswin/fg_main_mswin.c
b/src/mswin/fg_main_mswin.c
index
4ee9008
..
70984b2
100644
(file)
--- a/
src/mswin/fg_main_mswin.c
+++ b/
src/mswin/fg_main_mswin.c
@@
-339,7
+339,7
@@
static LRESULT fghWindowProcKeyPress(SFG_Window *window, UINT uMsg, GLboolean ke
return 1;
}
return 1;
}
-static SFG_Window* fghWindowUnderCursor(SFG_Window *window)
+SFG_Window* fghWindowUnderCursor(SFG_Window *window)
{
/* Check if the current window that the mouse is over is a child window
* of the window the message was sent to. Some events only sent to main window,
{
/* Check if the current window that the mouse is over is a child window
* of the window the message was sent to. Some events only sent to main window,
@@
-551,8
+551,7
@@
LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
break;
case WM_SETFOCUS:
break;
case WM_SETFOCUS:
-/* printf("WM_SETFOCUS: %p\n", window ); */
-
+ /*printf("WM_SETFOCUS: %p\n", window );*/
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
SetActiveWindow( window->Window.Handle );
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
SetActiveWindow( window->Window.Handle );
@@
-561,13
+560,11
@@
LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
break;
case WM_KILLFOCUS:
break;
case WM_KILLFOCUS:
- {
-/* printf("WM_KILLFOCUS: %p\n", window ); */
- lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
+ /*printf("WM_KILLFOCUS: %p\n", window ); */
+ lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
- /* Check if there are any open menus that need to be closed */
- fgPlatformCheckMenuDeactivate();
- }
+ /* Check if there are any open menus that need to be closed */
+ fgPlatformCheckMenuDeactivate();
break;
#if 0
break;
#if 0