Changeset 11476 for OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm

Timestamp:

05/28/10 17:56:43 (3 years ago)

Author:

robert

Message:

conversion of osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm

@@ -30 +30 @@
     OSErr error = SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
     if (error) {
-        osg::notify(osg::DEBUG_INFO) << "MenubarToggler::hide failed with " << error << std::endl;
+        OSG_DEBUG << "MenubarToggler::hide failed with " << error << std::endl;
     }
 }
@@ -39 +39 @@
     OSErr error = SetSystemUIMode(kUIModeNormal, 0);
     if (error) {
-        osg::notify(osg::DEBUG_INFO) << "MenubarToggler::show failed with " << error << std::endl;
+        OSG_DEBUG << "MenubarToggler::show failed with " << error << std::endl;
     }
 }
@@ -131 +131 @@
             {
                 ++windowsIntersectingMainScreen;
-                // osg::notify(osg::ALWAYS) << "testing rect " << windowBounds.origin.x << "/" << windowBounds.origin.y << " " << windowBounds.size.width << "x" << windowBounds.size.height << std::endl;
-                // osg::notify(osg::ALWAYS) << "against      " << _availRect.origin.x << "/" << _availRect.origin.y << " " << _availRect.size.width << "x" << _availRect.size.height << std::endl;
+                // OSG_ALWAYS << "testing rect " << windowBounds.origin.x << "/" << windowBounds.origin.y << " " << windowBounds.size.width << "x" << windowBounds.size.height << std::endl;
+                // OSG_ALWAYS << "against      " << _availRect.origin.x << "/" << _availRect.origin.y << " " << _availRect.size.width << "x" << _availRect.size.height << std::endl;
                 // the window intersects the main-screen, does it intersect with the menubar/dock?
                 if (((_availRect.origin.y > _mainScreenBounds.origin.y) && (_availRect.origin.y > windowBounds.origin.y)) ||
@@ -251 +251 @@
     if( CGGetActiveDisplayList( 0, NULL, &_displayCount ) != CGDisplayNoErr )
     {
-        osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: could not get # of screens" << std::endl;
+        OSG_WARN << "DarwinWindowingSystemInterface: could not get # of screens" << std::endl;
         _displayCount = 0;
 
@@ -262 +262 @@
     if( CGGetActiveDisplayList( _displayCount, _displayIds, &_displayCount ) != CGDisplayNoErr )
     {
-        osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: CGGetActiveDisplayList failed" << std::endl;
+        OSG_WARN << "DarwinWindowingSystemInterface: CGGetActiveDisplayList failed" << std::endl;
     }
 
@@ -275 +275 @@
     if (_displayCount==0)
     {
-        osg::notify(osg::WARN) << "DarwinWindowingSystemInterface::getDisplayID(..) no valid screens available returning 0 instead." << std::endl;
+        OSG_WARN << "DarwinWindowingSystemInterface::getDisplayID(..) no valid screens available returning 0 instead." << std::endl;
         return 0;
     }
@@ -285 +285 @@
     else
     {
-        osg::notify(osg::WARN) << "DarwinWindowingSystemInterface::getDisplayID(..) invalid screen # " << si.screenNum << ", returning main-screen instead." << std::endl;
+        OSG_WARN << "DarwinWindowingSystemInterface::getDisplayID(..) invalid screen # " << si.screenNum << ", returning main-screen instead." << std::endl;
         return _displayIds[0];
     }
@@ -369 +369 @@
     y = static_cast<int>(bounds.origin.y);
     
-    // osg::notify(osg::DEBUG_INFO) << "topleft of screen " << si.screenNum <<" " << bounds.origin.x << "/" << bounds.origin.y << std::endl;
+    // OSG_DEBUG << "topleft of screen " << si.screenNum <<" " << bounds.origin.x << "/" << bounds.origin.y << std::endl;
 }