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

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 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_frame.cc (modified) (4 diffs)

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

@@ -21 +21 @@
 namespace OrxGui
 {
-
+  ObjectListDefinition(GLGuiFrame);
   /**
    * standard constructor
@@ -44 +44 @@
   void GLGuiFrame::init()
   {
-    this->setClassID(CL_GLGUI_FRAME, "GLGuiFrame");
+    this->registerObject(this, GLGuiFrame::_objectList);
     this->child = NULL;
   }
@@ -71 +71 @@
     if (this->child != NULL)
     {
-      if (this->child->isA(CL_GLGUI_CONTAINER))
+      if (this->child->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(this->child)->showAll();
       else
@@ -83 +83 @@
     if (this->child != NULL)
     {
-      if (this->child->isA(CL_GLGUI_CONTAINER))
+      if (this->child->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(this->child)->hideAll();
       else