Show
Ignore:
Timestamp:
05/28/10 17:56:43 (4 years ago)
Author:
robert
Message:

conversion of osg::notify to OSG_INFO etc.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm

    r11207 r11476  
    3030    OSErr error = SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar); 
    3131    if (error) { 
    32         osg::notify(osg::DEBUG_INFO) << "MenubarToggler::hide failed with " << error << std::endl; 
     32        OSG_DEBUG << "MenubarToggler::hide failed with " << error << std::endl; 
    3333    } 
    3434} 
     
    3939    OSErr error = SetSystemUIMode(kUIModeNormal, 0); 
    4040    if (error) { 
    41         osg::notify(osg::DEBUG_INFO) << "MenubarToggler::show failed with " << error << std::endl; 
     41        OSG_DEBUG << "MenubarToggler::show failed with " << error << std::endl; 
    4242    } 
    4343} 
     
    131131            { 
    132132                ++windowsIntersectingMainScreen; 
    133                 // osg::notify(osg::ALWAYS) << "testing rect " << windowBounds.origin.x << "/" << windowBounds.origin.y << " " << windowBounds.size.width << "x" << windowBounds.size.height << std::endl; 
    134                 // osg::notify(osg::ALWAYS) << "against      " << _availRect.origin.x << "/" << _availRect.origin.y << " " << _availRect.size.width << "x" << _availRect.size.height << std::endl; 
     133                // OSG_ALWAYS << "testing rect " << windowBounds.origin.x << "/" << windowBounds.origin.y << " " << windowBounds.size.width << "x" << windowBounds.size.height << std::endl; 
     134                // OSG_ALWAYS << "against      " << _availRect.origin.x << "/" << _availRect.origin.y << " " << _availRect.size.width << "x" << _availRect.size.height << std::endl; 
    135135                // the window intersects the main-screen, does it intersect with the menubar/dock? 
    136136                if (((_availRect.origin.y > _mainScreenBounds.origin.y) && (_availRect.origin.y > windowBounds.origin.y)) || 
     
    251251    if( CGGetActiveDisplayList( 0, NULL, &_displayCount ) != CGDisplayNoErr ) 
    252252    { 
    253         osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: could not get # of screens" << std::endl; 
     253        OSG_WARN << "DarwinWindowingSystemInterface: could not get # of screens" << std::endl; 
    254254        _displayCount = 0; 
    255255 
     
    262262    if( CGGetActiveDisplayList( _displayCount, _displayIds, &_displayCount ) != CGDisplayNoErr ) 
    263263    { 
    264         osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: CGGetActiveDisplayList failed" << std::endl; 
     264        OSG_WARN << "DarwinWindowingSystemInterface: CGGetActiveDisplayList failed" << std::endl; 
    265265    } 
    266266 
     
    275275    if (_displayCount==0) 
    276276    { 
    277         osg::notify(osg::WARN) << "DarwinWindowingSystemInterface::getDisplayID(..) no valid screens available returning 0 instead." << std::endl; 
     277        OSG_WARN << "DarwinWindowingSystemInterface::getDisplayID(..) no valid screens available returning 0 instead." << std::endl; 
    278278        return 0; 
    279279    } 
     
    285285    else 
    286286    { 
    287         osg::notify(osg::WARN) << "DarwinWindowingSystemInterface::getDisplayID(..) invalid screen # " << si.screenNum << ", returning main-screen instead." << std::endl; 
     287        OSG_WARN << "DarwinWindowingSystemInterface::getDisplayID(..) invalid screen # " << si.screenNum << ", returning main-screen instead." << std::endl; 
    288288        return _displayIds[0]; 
    289289    } 
     
    369369    y = static_cast<int>(bounds.origin.y); 
    370370     
    371     // osg::notify(osg::DEBUG_INFO) << "topleft of screen " << si.screenNum <<" " << bounds.origin.x << "/" << bounds.origin.y << std::endl; 
     371    // OSG_DEBUG << "topleft of screen " << si.screenNum <<" " << bounds.origin.x << "/" << bounds.origin.y << std::endl; 
    372372} 
    373373