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

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/glgui_widget.cc (modified) (3 diffs)

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

@@ -25 +25 @@
 
 #include "loading/load_param.h"
-
-/// TODO TAKE THIS OUT OF HERE
 #include "loading/resource_manager.h"
 
 namespace OrxGui
 {
-
+  ObjectListDefinition(GLGuiWidget);
   /**
    * @brief standard constructor
@@ -95 +93 @@
   void GLGuiWidget::init()
   {
-    this->setClassID(CL_GLGUI_WIDGET, "GLGuiWidget");
+    this->registerObject(this, GLGuiWidget::_objectList);
 
     this->_focusable = false;
@@ -104 +102 @@
 
     if(GLGuiWidget::_defaultFont == NULL)
-      GLGuiWidget::_defaultFont = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
+      GLGuiWidget::_defaultFont = new Font(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/final_frontier.ttf", 20);
 
     this->_font = *GLGuiWidget::_defaultFont;