projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reimplemented the client-area/window-area conversion code. It should now
[freeglut]
/
src
/
mswin
/
fg_menu_mswin.c
diff --git
a/src/mswin/fg_menu_mswin.c
b/src/mswin/fg_menu_mswin.c
index
0d6a599
..
3d83693
100644
(file)
--- a/
src/mswin/fg_menu_mswin.c
+++ b/
src/mswin/fg_menu_mswin.c
@@
-29,7
+29,7
@@
#include <GL/freeglut.h>
#include "../fg_internal.h"
#include <GL/freeglut.h>
#include "../fg_internal.h"
-extern RECT fghGetClientArea( const SFG_Window *window, BOOL wantPosOutside );
+extern void fghGetClientArea( RECT *clientRect, const SFG_Window *window, BOOL wantPosOutside );
GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
@@
-69,11
+69,12
@@
void fgPlatformCheckMenuDeactivate()
else
{
/* Check if focus lost because non-client area of
else
{
/* Check if focus lost because non-client area of
- * window was pressed (pressing on client area is
- * handled in fgCheckActiveMenu)
- */
+ * window was pressed (pressing on client area is
+ * handled in fgCheckActiveMenu)
+ */
POINT mouse_pos;
POINT mouse_pos;
- RECT clientArea = fghGetClientArea(menu->ParentWindow, GL_FALSE);
+ RECT clientArea;
+ fghGetClientArea(&clientArea,menu->ParentWindow, GL_FALSE);
GetCursorPos(&mouse_pos);
if ( !PtInRect( &clientArea, mouse_pos ) )
fgDeactivateMenu(menu->ParentWindow);
GetCursorPos(&mouse_pos);
if ( !PtInRect( &clientArea, mouse_pos ) )
fgDeactivateMenu(menu->ParentWindow);