Changeset 9869 in orxonox.OLD for trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.h

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/glmenu/glmenu_imagescreen.h (modified) (2 diffs)

trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.h

@@ -15 +15 @@
 class GLMenuImageScreen : public BaseObject
 {
-
+  ObjectListDeclaration(GLMenuImageScreen);
 public:
   GLMenuImageScreen (const TiXmlElement* root = NULL);
@@ -33 +33 @@
   void setMaximum (int maxValue);
   /** @returns the maximum of countable steps*/
-  inline int GLMenuImageScreen::getMaximum() const { return this->maxValue; };
+  inline int getMaximum() const { return this->maxValue; };
 
   void setValue (int currentValue);