Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgWidget/Window.cpp

    r12366 r13041  
    1313    ev.getWindow()->addOrigin(ev.x, ev.y); 
    1414    ev.getWindow()->update(); 
    15      
     15 
    1616    return true; 
    1717} 
     
    2222    ev.getWindow()->addRotate(ev.y); 
    2323    ev.getWindow()->update(); 
    24      
     24 
    2525    return true; 
    2626} 
     
    3131    ev.getWindow()->addScale(ev.y); 
    3232    ev.getWindow()->update(); 
    33      
     33 
    3434    return true; 
    3535} 
     
    3737bool callbackWindowTabFocus(Event& ev) { 
    3838    if(!ev.getWindow() || ev.key != osgGA::GUIEventAdapter::KEY_Tab) return false; 
    39      
     39 
    4040    return ev.getWindow()->setNextFocusable(); 
    4141} 
     
    6565        << "EmbeddedWindow Widget [" << _name 
    6666        << "] cannot embed itself in Window [" << _window->getName() 
    67         << "], since it is already a child of [" << _window->_parent->getName()  
     67        << "], since it is already a child of [" << _window->_parent->getName() 
    6868        << "]" << std::endl 
    6969    ; 
     
    303303        _wm->getHeight() * (height / 100.0f) 
    304304    ); 
    305      
     305 
    306306    else return resize( 
    307307        _parent->getWidth() * (width / 100.0f), 
     
    333333        xy.set(x, y); 
    334334    } 
    335      
     335 
    336336    matrix_type z = _z; 
    337337 
     
    413413 
    414414    if(hasDecimal(_width.current)) _setWidthAndHeightNotPAError("current width", _width.current); 
    415      
     415 
    416416    if(hasDecimal(_width.minimum)) _setWidthAndHeightNotPAError("minimum width", _width.minimum); 
    417      
     417 
    418418    if(hasDecimal(_height.current)) _setWidthAndHeightNotPAError("current height", _height.current); 
    419      
     419 
    420420    if(hasDecimal(_height.minimum)) _setWidthAndHeightNotPAError("minimum height", _height.minimum); 
    421421} 
     
    438438    if(!widget) { 
    439439        warn() << "Window [" << _name << "] called addWidget with NULL." << std::endl; 
    440          
     440 
    441441        return false; 
    442442    } 
     
    481481 
    482482    geode->addDrawable(widget); 
    483      
     483 
    484484    _setParented(widget); 
    485485    _setManaged(widget); 
     
    532532void Window::_setParented(Widget* widget, bool setUnparented) { 
    533533    if(!widget) return; 
    534      
     534 
    535535    if(!setUnparented) { 
    536536        widget->_parent = this; 
     
    548548void Window::_setManaged(Widget* widget, bool setUnmanaged) { 
    549549    if(!widget || !_wm) return; 
    550      
     550 
    551551    // Tell the widget it's managed if it isn't already... 
    552552    if(!setUnmanaged) { 
     
    676676        for(WindowList::iterator w = wl.begin(); w != wl.end(); w++) { 
    677677            ConstIterator ii = std::find(w->get()->begin(), w->get()->end(), widget); 
    678              
     678 
    679679            if(ii != w->get()->end()) { 
    680680                found = true; 
     
    737737 
    738738    _setFocused(w1); 
    739      
     739 
    740740    return true; 
    741741} 
     
    10221022Window::Sizes Window::_getWidthImplementation() const { 
    10231023    osg::BoundingBox bb = getGeode()->getBoundingBox(); 
    1024      
     1024 
    10251025    point_type w = osg::round(bb.xMax() - bb.xMin()); 
    10261026