diff --git a/include/osgUI/Dialog b/include/osgUI/Dialog index a4dee645f..e0dec98e5 100644 --- a/include/osgUI/Dialog +++ b/include/osgUI/Dialog @@ -31,9 +31,6 @@ public: std::string& getTitle() { return _title; } const std::string& getTitle() const { return _title; } - void close(); - void open(); - bool handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event); virtual void createGraphicsImplementation(); diff --git a/include/osgUI/Popup b/include/osgUI/Popup index 70e9f38c9..20fac2a24 100644 --- a/include/osgUI/Popup +++ b/include/osgUI/Popup @@ -28,9 +28,6 @@ public: Popup(const Popup& dialog, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); META_Node(osgUI, Popup); - void close(); - void open(); - virtual void leaveImplementation(); bool handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event); diff --git a/src/osgUI/Dialog.cpp b/src/osgUI/Dialog.cpp index d3d61d227..c939479f7 100644 --- a/src/osgUI/Dialog.cpp +++ b/src/osgUI/Dialog.cpp @@ -43,7 +43,7 @@ bool Dialog::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event) if (ea->getKey()=='c') { - close(); + setVisible(false); ea->setHandled(true); return true; @@ -57,16 +57,6 @@ bool Dialog::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event) return false; } -void Dialog::close() -{ - setVisible(false); -} - -void Dialog::open() -{ - setVisible(true); -} - void Dialog::createGraphicsImplementation() { _group = new osg::Group; diff --git a/src/osgUI/Popup.cpp b/src/osgUI/Popup.cpp index 6533691c4..436faa3d7 100644 --- a/src/osgUI/Popup.cpp +++ b/src/osgUI/Popup.cpp @@ -45,7 +45,7 @@ bool Popup::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event) if (ea->getKey()=='c') { - close(); + setVisible(false); ea->setHandled(true); return true; @@ -59,19 +59,9 @@ bool Popup::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event) return false; } -void Popup::close() -{ - setVisible(false); -} - -void Popup::open() -{ - setVisible(true); -} - void Popup::leaveImplementation() { - close(); + setVisible(false); } void Popup::createGraphicsImplementation() diff --git a/src/osgWrappers/serializers/osgUI/Dialog.cpp b/src/osgWrappers/serializers/osgUI/Dialog.cpp index 62c8c7c41..422042768 100644 --- a/src/osgWrappers/serializers/osgUI/Dialog.cpp +++ b/src/osgWrappers/serializers/osgUI/Dialog.cpp @@ -11,6 +11,4 @@ REGISTER_OBJECT_WRAPPER( Dialog, "osg::Object osg::Node osg::Group osgUI::Widget osgUI::Dialog" ) { ADD_STRING_SERIALIZER( Title, std::string()); - ADD_METHOD( open ); - ADD_METHOD( close ); } diff --git a/src/osgWrappers/serializers/osgUI/Popup.cpp b/src/osgWrappers/serializers/osgUI/Popup.cpp index 0c414b02b..423d08d40 100644 --- a/src/osgWrappers/serializers/osgUI/Popup.cpp +++ b/src/osgWrappers/serializers/osgUI/Popup.cpp @@ -10,6 +10,4 @@ REGISTER_OBJECT_WRAPPER( Popup, osgUI::Popup, "osg::Object osg::Node osg::Group osgUI::Widget osgUI::Popup" ) { - ADD_METHOD( open ); - ADD_METHOD( close ); }