projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaning up mixed tabs and spaces
[freeglut]
/
src
/
mswin
/
fg_menu_mswin.c
diff --git
a/src/mswin/fg_menu_mswin.c
b/src/mswin/fg_menu_mswin.c
index
33b59ba
..
78ea707
100644
(file)
--- a/
src/mswin/fg_menu_mswin.c
+++ b/
src/mswin/fg_menu_mswin.c
@@
-1,5
+1,5
@@
/*
/*
- * freeglut_menu_mswin.c
+ * fg_menu_mswin.c
*
* The Windows-specific mouse cursor related stuff.
*
*
* The Windows-specific mouse cursor related stuff.
*
@@
-85,7
+85,7
@@
void fgPlatformCheckMenuDeactivate(HWND newFocusWnd)
/* window that got focus was not one of the active menus. That means we'll
* close the active menu's unless the window that got focus was their parent */
menu = fgGetActiveMenu();
/* window that got focus was not one of the active menus. That means we'll
* close the active menu's unless the window that got focus was their parent */
menu = fgGetActiveMenu();
-
+
if (newFocusWnd != menu->ParentWindow->Window.Handle)
{
/* focus shifted to another window than the menu's parent, close menus */
if (newFocusWnd != menu->ParentWindow->Window.Handle)
{
/* focus shifted to another window than the menu's parent, close menus */
@@
-106,3
+106,8
@@
int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl
return glutCreateMenu( callback );
}
return glutCreateMenu( callback );
}
+int FGAPIENTRY __glutCreateMenuUcallWithExit(void(*callback)(int, void*), void(__cdecl *exit_function)(int), void* user_data)
+{
+ __glutExitFunc = exit_function;
+ return glutCreateMenuUcall(callback, user_data);
+}