Changeset 9869 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_container.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_container.cc (modified) (2 diffs)

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

@@ -20 +20 @@
 namespace OrxGui
 {
-
+  ObjectListDefinition(GLGuiContainer);
   /**
    * standard constructor
@@ -41 +41 @@
   void GLGuiContainer::init()
   {
-    this->setClassID(CL_GLGUI_CONTAINER, "GLGuiContainer");
+    this->registerObject(this, GLGuiContainer::_objectList);
 
     this->setBackgroundTexture("gui_container_background.png");