Changeset 3544 in orxonox.OLD for orxonox/trunk/src/glmenu

Timestamp:

Mar 14, 2005, 10:54:00 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now the delete-process is as inteded by c++
virtual ~ClassName extends deletion and deletes also the MasterClass

Location:

orxonox/trunk/src/glmenu

Files:

• glmenu_imagescreen.cc (modified) (1 diff)
• glmenu_imagescreen.h (modified) (1 diff)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -46 +46 @@
 /**
    \brief standard deconstructor
+   \todo this deconstructor is not jet implemented - do it
 */
 GLMenuImageScreen::~GLMenuImageScreen() 
-{
-  this->destroy();
-}
-
-/**
-   \brief deletes all alocated Memory and also deletes everything from the Class this one is erived from
-
-   \todo this deconstructor is not jet implemented - do it
-*/
-void GLMenuImageScreen::destroy(void)
 {
   if (backMat)
     delete backMat;
-
-  static_cast<BaseObject*>(this)->destroy();
 }
 

orxonox/trunk/src/glmenu/glmenu_imagescreen.h

@@ -18 +18 @@
 
  public:
-  ~GLMenuImageScreen ();
-  void destroy(void);
-
+  virtual ~GLMenuImageScreen ();
+  
   static GLMenuImageScreen* getInstance();