From 9be44446271b247aa0c99323bc79919b2d80c153 Mon Sep 17 00:00:00 2001
From: sandalle <sandalle@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Tue, 5 Aug 2003 15:16:12 +0000
Subject: [PATCH] src/freeglut_main.c:816 and :1571, set the current window
 (John F. Fay)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@159 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/freeglut/ChangeLog           |  6 ++++++
 freeglut/freeglut/src/freeglut_main.c | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/freeglut/freeglut/ChangeLog b/freeglut/freeglut/ChangeLog
index 2bb8206..3fbb653 100644
--- a/freeglut/freeglut/ChangeLog
+++ b/freeglut/freeglut/ChangeLog
@@ -257,3 +257,9 @@ October 24, 2002:
 
 (96) src/freeglut_window.c:551  Removed extra carriage return for Windows users (John F. Fay)
 
+
+*******************************************************************************************
+* Changes on 05 August 2003
+*******************************************************************************************
+
+(97) src/freeglut_main.c:816 and :1571, set the current window (John F. Fay)
diff --git a/freeglut/freeglut/src/freeglut_main.c b/freeglut/freeglut/src/freeglut_main.c
index 858116a..50dd5e4 100644
--- a/freeglut/freeglut/src/freeglut_main.c
+++ b/freeglut/freeglut/src/freeglut_main.c
@@ -814,6 +814,11 @@ void FGAPIENTRY glutMainLoopEvent( void )
          */
         if( fgStructure.Window->Callbacks.Mouse == NULL )
           break;
+        /*
+         * Set the current window
+         */
+        fgSetWindow ( window );
+
 
         /*
          * Remember the current modifiers state
@@ -1570,6 +1575,11 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
             ( ( (GetKeyState( VK_LCONTROL ) < 0 ) || ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL  : 0 ) |
             ( ( (GetKeyState( VK_LMENU    ) < 0 ) || ( GetKeyState( VK_RMENU    ) < 0 )) ? GLUT_ACTIVE_ALT   : 0 );
 
+        /*
+         * Set the current window
+         */
+        fgSetWindow ( window );
+
         /*
          * Finally execute the mouse callback
          */