FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed Dialog/Popup::open/close() methods as they are replaced by the setVisible() method

Browse Source
This commit is contained in:
Robert Osfield 2014-05-26 16:32:20 +00:00
parent 5d635287c0
commit faced0a896
6 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgUI/Dialog
View File

@ -31,9 +31,6 @@ public:
std::string& getTitle() { return _title; } std::string& getTitle() { return _title; }
const std::string& getTitle() const { return _title; } const std::string& getTitle() const { return _title; }
void close();
void open();
bool handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event); bool handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event);
virtual void createGraphicsImplementation(); virtual void createGraphicsImplementation();

3
include/osgUI/Popup
View File

@ -28,9 +28,6 @@ public:
Popup(const Popup& dialog, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); Popup(const Popup& dialog, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
META_Node(osgUI, Popup); META_Node(osgUI, Popup);
void close();
void open();
virtual void leaveImplementation(); virtual void leaveImplementation();
bool handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event); bool handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event);

12
src/osgUI/Dialog.cpp
View File

@ -43,7 +43,7 @@ bool Dialog::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
if (ea->getKey()=='c') if (ea->getKey()=='c')
{ {
close(); setVisible(false);
ea->setHandled(true); ea->setHandled(true);
return true; return true;
@ -57,16 +57,6 @@ bool Dialog::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
return false; return false;
} }
void Dialog::close()
{
setVisible(false);
}
void Dialog::open()
{
setVisible(true);
}
void Dialog::createGraphicsImplementation() void Dialog::createGraphicsImplementation()
{ {
_group = new osg::Group; _group = new osg::Group;

14
src/osgUI/Popup.cpp
View File

@ -45,7 +45,7 @@ bool Popup::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
if (ea->getKey()=='c') if (ea->getKey()=='c')
{ {
close(); setVisible(false);
ea->setHandled(true); ea->setHandled(true);
return true; return true;
@ -59,19 +59,9 @@ bool Popup::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
return false; return false;
} }
void Popup::close()
{
setVisible(false);
}
void Popup::open()
{
setVisible(true);
}
void Popup::leaveImplementation() void Popup::leaveImplementation()
{ {
close(); setVisible(false);
} }
void Popup::createGraphicsImplementation() void Popup::createGraphicsImplementation()

2
src/osgWrappers/serializers/osgUI/Dialog.cpp
View File

@ -11,6 +11,4 @@ REGISTER_OBJECT_WRAPPER( Dialog,
"osg::Object osg::Node osg::Group osgUI::Widget osgUI::Dialog" ) "osg::Object osg::Node osg::Group osgUI::Widget osgUI::Dialog" )
{ {
ADD_STRING_SERIALIZER( Title, std::string()); ADD_STRING_SERIALIZER( Title, std::string());
ADD_METHOD( open );
ADD_METHOD( close );
} }

2
src/osgWrappers/serializers/osgUI/Popup.cpp
View File

@ -10,6 +10,4 @@ REGISTER_OBJECT_WRAPPER( Popup,
osgUI::Popup, osgUI::Popup,
"osg::Object osg::Node osg::Group osgUI::Widget osgUI::Popup" ) "osg::Object osg::Node osg::Group osgUI::Widget osgUI::Popup" )
{ {
ADD_METHOD( open );
ADD_METHOD( close );
} }