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

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..

Location:

trunk/src/lib/gui/gl/specials

Files:

• glgui_notifier.cc (modified) (2 diffs)
• glgui_notifier.h (modified) (2 diffs)

trunk/src/lib/gui/gl/specials/glgui_notifier.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-
+  ObjectListDefinition(GLGuiNotifier);
   /**
    * @brief standard constructor
@@ -29 +29 @@
   GLGuiNotifier::GLGuiNotifier ()
   {
-    this->setClassID(CL_GLGUI_NOTIFIER, "GLGuiNotifier");
+    this->registerObject(this, GLGuiNotifier::_objectList);
 
     // Element2D and generals

trunk/src/lib/gui/gl/specials/glgui_notifier.h

@@ -24 +24 @@
   class GLGuiNotifier : public GLGuiWidget
   {
+    ObjectListDeclaration(GLGuiNotifier);
   public:
     GLGuiNotifier();
@@ -67 +68 @@
       MultiLineText*    text;
 
-    } DisplayLine;
+    }
+    DisplayLine;