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

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

@@ -22 +22 @@
 namespace OrxGui
 {
-
+  ObjectListDefinition(GLGuiImage);
   /**
    * standard constructor
@@ -45 +45 @@
   void GLGuiImage::init()
   {
-    this->setClassID(CL_GLGUI_IMAGE, "GLGuiImage");
+    this->registerObject(this, GLGuiImage::_objectList);
 
     this->setForegroundColor(Color(1,1,1,1));