Merge branch 'ehofman/mingw'

[flightgear.git] / src / Main / FGEventHandler.cxx

diff --git a/src/Main/FGEventHandler.cxx b/src/Main/FGEventHandler.cxx
index 16babdeada1ff98ce6949fc2ccfef12292708c39..d6be62054e365fd9704147a01678a43ba014d6e4 100644 (file)
--- a/src/Main/FGEventHandler.cxx
+++ b/src/Main/FGEventHandler.cxx
@@ -147,10 +147,6 @@ bool FGEventHandler::handle(const osgGA::GUIEventAdapter& ea,
 
     switch (ea.getEventType()) {
     case osgGA::GUIEventAdapter::FRAME:
-        if (idleHandler)
-            (*idleHandler)();
-        if (drawHandler)
-            (*drawHandler)();
         mouseWarped = false;
         handleStats(us);
         return true;
@@ -275,9 +271,14 @@ void FGEventHandler::handleKey(const osgGA::GUIEventAdapter& ea, int& key,
     std::map<int, int>::iterator numPadIter = numlockKeyMap.find(key);
 
     if (numPadIter != numlockKeyMap.end()) {
+#ifdef __APPLE__
+        // Num Lock is always true on Mac
+        key = numPadIter->second;
+#else
         if (ea.getModKeyMask() & osgGA::GUIEventAdapter::MODKEY_NUM_LOCK) {
             key = numPadIter->second;
         }
+#endif
     }
 
     modifiers = osgToFGModifiers(ea.getModKeyMask());