Changeset 10417

Show
Ignore:
Timestamp:
06/25/09 18:12:58 (4 years ago)
Author:
robert
Message:

From Stephan Huber, fixes to Cocoa support

Location:
OpenSceneGraph/trunk/src/osgViewer
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm

    r10340 r10417  
    146146        } 
    147147        else 
    148             i= _list.erase(i); 
     148            i = _list.erase(i); 
    149149    } 
    150150     
    … …  
    183183            error = SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar); 
    184184        }  
    185         else  
     185        if (!windowsCoveringMenubarArea && !_menubarShown)  
    186186        { 
    187187            error = SetSystemUIMode(kUIModeNormal, 0); 

  • OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

    r10340 r10417  
    2020#include "DarwinUtils.h" 
    2121 
    22 #define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl; 
    23  
    24 //#define DEBUG_OUT(s) ; 
     22//#define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl; 
     23 
     24#define DEBUG_OUT(s) ; 
    2525 
    2626static bool s_quit_requested = false; 
    … …  
    4444        { 
    4545            _keymap[27]     = osgGA::GUIEventAdapter::KEY_Escape; 
    46             _keymap[13]     = osgGA::GUIEventAdapter::KEY_KP_Enter; 
    47             _keymap[3]      = osgGA::GUIEventAdapter::KEY_Return; 
     46            _keymap[13]     = osgGA::GUIEventAdapter::KEY_Return; 
     47            _keymap[3]      = osgGA::GUIEventAdapter::KEY_KP_Enter; 
    4848            _keymap[9]      = osgGA::GUIEventAdapter::KEY_Tab; 
    4949            _keymap[32]     = osgGA::GUIEventAdapter::KEY_Space;