Show
Ignore:
Timestamp:
02/10/10 13:44:59 (5 years ago)
Author:
robert
Message:

Convert NOTIFY to OSG_NOTIFY to avoid problems with polution of users apps with the NOTIFY macro

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

    r11043 r11046  
    4040    OSStatus            result = eventNotHandledErr; /* report failure by default */ 
    4141     
    42     NOTIFY(osg::INFO) << "GraphicsWindowEventHandler" << std::endl; 
     42    OSG_NOTIFY(osg::INFO) << "GraphicsWindowEventHandler" << std::endl; 
    4343 
    4444    GraphicsWindowCarbon* w = (GraphicsWindowCarbon*)userData; 
     
    248248    if (!_pixelFormat) 
    249249    { 
    250         NOTIFY(osg::WARN) << "GraphicsWindowCarbon::init could not create a valid pixelformat" << std::endl; 
     250        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::init could not create a valid pixelformat" << std::endl; 
    251251    } 
    252252    _valid = (_pixelFormat != NULL); 
     
    277277        if (err != noErr) 
    278278        { 
    279             NOTIFY(osg::WARN) << "GraphicsWindowCarbon::setWindowDecoration failed with " << err << std::endl; 
     279            OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::setWindowDecoration failed with " << err << std::endl; 
    280280            return false; 
    281281        } 
     
    351351    if (!_traits) return false; 
    352352     
    353     NOTIFY(osg::INFO) << "GraphicsWindowCarbon:: realizeIMplementation" << std::endl; 
     353    OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon:: realizeIMplementation" << std::endl; 
    354354     
    355355    setWindowDecoration(_traits->windowDecoration); 
     
    378378 
    379379        if (err) { 
    380             NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation() failed creating a window: " << err << std::endl; 
     380            OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation() failed creating a window: " << err << std::endl; 
    381381            return false; 
    382382        } else { 
    383             NOTIFY(osg::INFO) << "GraphicsWindowCarbon::realizeImplementation() - window created with bounds(" << bounds.top << ", " << bounds.left << ", " << bounds.bottom << ", " << bounds.right << ")" << std::endl; 
     383            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::realizeImplementation() - window created with bounds(" << bounds.top << ", " << bounds.left << ", " << bounds.bottom << ", " << bounds.right << ")" << std::endl; 
    384384        } 
    385385    } 
     
    411411 
    412412    if (!_context) { 
    413         NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation failed creating a context: " << aglGetError() << std::endl; 
     413        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation failed creating a context: " << aglGetError() << std::endl; 
    414414        return false; 
    415415    } 
     
    442442        if (cgerr != kCGLNoError ) 
    443443        { 
    444             NOTIFY(osg::INFO) << "GraphicsWindowCarbon:: Multi-threaded OpenGL Execution not available" << std::endl; 
     444            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon:: Multi-threaded OpenGL Execution not available" << std::endl; 
    445445        }  
    446446    } 
     
    470470    if (!_realized) 
    471471    { 
    472         NOTIFY(osg::NOTICE)<<"Warning: GraphicsWindow not realized, cannot do makeCurrent."<<std::endl; 
     472        OSG_NOTIFY(osg::NOTICE)<<"Warning: GraphicsWindow not realized, cannot do makeCurrent."<<std::endl; 
    473473        return false; 
    474474    } 
    475475 
    476     // NOTIFY(osg::NOTICE)<<"makeCurrentImplementation "<<this<<" "<<OpenThreads::Thread::CurrentThread()<<std::endl; 
    477     // NOTIFY(osg::NOTICE)<<"   glXMakeCurrent ("<<_display<<","<<_window<<","<<_glxContext<<std::endl; 
     476    // OSG_NOTIFY(osg::NOTICE)<<"makeCurrentImplementation "<<this<<" "<<OpenThreads::Thread::CurrentThread()<<std::endl; 
     477    // OSG_NOTIFY(osg::NOTICE)<<"   glXMakeCurrent ("<<_display<<","<<_window<<","<<_glxContext<<std::endl; 
    478478    return (aglSetCurrentContext(NULL) == GL_TRUE); 
    479479} 
     
    483483void GraphicsWindowCarbon::closeImplementation() 
    484484{ 
    485     // NOTIFY(osg::INFO) << "GraphicsWindowCarbon::closeImplementation" << std::endl; 
     485    // OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::closeImplementation" << std::endl; 
    486486    _valid = false; 
    487487    _realized = false; 
     
    742742    GetEventParameter (theEvent,kEventParamKeyCode,typeUInt32, NULL,sizeof(rawkey), NULL,&rawkey); 
    743743     
    744     // NOTIFY(osg::INFO) << "key code: " << rawkey << " modifiers: " << modifierKeys << std::endl; 
     744    // OSG_NOTIFY(osg::INFO) << "key code: " << rawkey << " modifiers: " << modifierKeys << std::endl; 
    745745             
    746746    UInt32 dataSize; 
     
    761761        { 
    762762            //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask); 
    763             NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl; 
     763            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl; 
    764764            getEventQueue()->keyPress(keychar); 
    765765            break; 
     
    768768        case kEventRawKeyUp: 
    769769        {                  
    770             NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl; 
     770            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl; 
    771771            //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask); 
    772772            getEventQueue()->keyRelease(keychar); 
     
    941941{ 
    942942   // TODO: implement 
    943    NOTIFY(osg::ALWAYS) << "GraphicsWindowCarbon::grabFocusIfPointerInWindow" << std::endl; 
     943   OSG_NOTIFY(osg::ALWAYS) << "GraphicsWindowCarbon::grabFocusIfPointerInWindow" << std::endl; 
    944944} 
    945945 
     
    952952    DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface()); 
    953953    if (wsi == NULL) { 
    954         NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor :: could not get OSXCarbonWindowingSystemInterface" << std::endl; 
     954        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor :: could not get OSXCarbonWindowingSystemInterface" << std::endl; 
    955955        return; 
    956956    } 
     
    968968    } 
    969969    if (err != kCGErrorSuccess) { 
    970         NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor failed with " << err << std::endl; 
     970        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor failed with " << err << std::endl; 
    971971    } 
    972972} 
     
    10021002        default: 
    10031003            cursor = kThemeArrowCursor; 
    1004             NOTIFY(osg::WARN) << "GraphicsWindowCarbon::setCursor doesn't implement cursor: type = " << mouseCursor << std::endl; 
     1004            OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::setCursor doesn't implement cursor: type = " << mouseCursor << std::endl; 
    10051005    } 
    10061006     
     
    10271027    DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface()); 
    10281028    if (wsi == NULL) { 
    1029         NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor :: could not get OSXCarbonWindowingSystemInterface" << std::endl; 
     1029        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor :: could not get OSXCarbonWindowingSystemInterface" << std::endl; 
    10301030        return; 
    10311031    }