diff --git a/include/gepetto/gui/osgwidget.hh b/include/gepetto/gui/osgwidget.hh index 00413c93716bd5494815b0762afba88768480bfc..3060db2a10b564c8134b35c808bdff4c7a1988d7 100644 --- a/include/gepetto/gui/osgwidget.hh +++ b/include/gepetto/gui/osgwidget.hh @@ -39,8 +39,6 @@ namespace gepetto { /// Replace the camera at her home position. virtual void onHome(); - int wid () const; - void addFloor(); void attachToWindow (const std::string nodeName); diff --git a/src/gepetto/corbaserver/client.py b/src/gepetto/corbaserver/client.py index 2df5a6e57a7e55c0f6998992a270e90b48cacfbb..9a6f051a5b4e3d110ee9f847f4a1627d7005648d 100644 --- a/src/gepetto/corbaserver/client.py +++ b/src/gepetto/corbaserver/client.py @@ -79,7 +79,7 @@ class Client: try: from PythonQt.gepetto import MainWindow # At this point, we are in the python interpreter of gepetto-gui - self.gui.createWindow = lambda x: MainWindow.instance().createView(x).wid() + self.gui.createWindow = lambda x: MainWindow.instance().createView(x).windowID() except ImportError: # At this point, we are NOT in the python interpreter of gepetto-gui pass diff --git a/src/gui/osgwidget.cc b/src/gui/osgwidget.cc index f4e3b8be13a7f5e3067aaa7b6abb3143c39bf106..e1d554a3f7510228d40876d1725d63e8627494d8 100644 --- a/src/gui/osgwidget.cc +++ b/src/gui/osgwidget.cc @@ -165,11 +165,6 @@ namespace gepetto { return wid_; } - int OSGWidget::wid() const - { - return int(wid_); - } - graphics::WindowManagerPtr_t OSGWidget::window() const { return wm_; diff --git a/src/gui/python-decorator.hh b/src/gui/python-decorator.hh index 6e0973c44a94d69e34edfdb438908336b7ec6372..0fb50c5f51e0c52b53a986cf14b32635475e62ea 100644 --- a/src/gui/python-decorator.hh +++ b/src/gui/python-decorator.hh @@ -14,6 +14,8 @@ namespace gepetto { public slots: MainWindow* static_MainWindow_instance () const { return MainWindow::instance (); } + + int windowID (OSGWidget* o) const { return o->windowID(); } }; } // namespace gui } // namespace gepetto