Changeset 9869 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_box.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/gui/gl/glgui_box.cc (modified) (4 diffs)

trunk/src/lib/gui/gl/glgui_box.cc

@@ -22 +22 @@
 namespace OrxGui
 {
+  ObjectListDefinition(GLGuiBox);
   /**
    * standard constructor
@@ -52 +53 @@
   void GLGuiBox::init()
   {
-    this->setClassID(CL_GLGUI_BOX, "GLGuiBox");
+    this->registerObject(this, GLGuiBox::_objectList);
   }
 
@@ -149 +150 @@
     while (itC != this->_children.end())
     {
-      if ((*itC)->isA(CL_GLGUI_CONTAINER))
+      if ((*itC)->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(*itC)->showAll();
       else
@@ -164 +165 @@
     while (itC != this->_children.end())
     {
-      if ((*itC)->isA(CL_GLGUI_CONTAINER))
+      if ((*itC)->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(*itC)->hideAll();
       else