Index: /OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm
===================================================================
--- /OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm (revision 10340)
+++ /OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm (revision 10417)
@@ -20,7 +20,7 @@
 #include "DarwinUtils.h"
 
-#define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl;
-
-//#define DEBUG_OUT(s) ;
+//#define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl;
+
+#define DEBUG_OUT(s) ;
 
 static bool s_quit_requested = false;
@@ -44,6 +44,6 @@
         {
             _keymap[27]     = osgGA::GUIEventAdapter::KEY_Escape;
-            _keymap[13]     = osgGA::GUIEventAdapter::KEY_KP_Enter;
-            _keymap[3]      = osgGA::GUIEventAdapter::KEY_Return;
+            _keymap[13]     = osgGA::GUIEventAdapter::KEY_Return;
+            _keymap[3]      = osgGA::GUIEventAdapter::KEY_KP_Enter;
             _keymap[9]      = osgGA::GUIEventAdapter::KEY_Tab;
             _keymap[32]     = osgGA::GUIEventAdapter::KEY_Space;
Index: /OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm
===================================================================
--- /OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm (revision 10340)
+++ /OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm (revision 10417)
@@ -146,5 +146,5 @@
         }
         else
-            i= _list.erase(i);
+            i = _list.erase(i);
     }
     
@@ -183,5 +183,5 @@
             error = SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
         } 
-        else 
+        if (!windowsCoveringMenubarArea && !_menubarShown) 
         {
             error = SetSystemUIMode(kUIModeNormal, 0);