Changeset 9549 in orxonox.OLD

Timestamp:

Jul 28, 2006, 11:43:02 AM (18 years ago)

Author:

bensch

Message:

should link

Location:

branches/proxy/src

Files:

• lib/gui/gl/Makefile.am (modified) (2 diffs)
• lib/gui/gl/glgui.h (modified) (1 diff)
• lib/gui/gl/glgui_fixedposition_box.cc (modified) (2 diffs)
• lib/gui/gl/glgui_fixedposition_box.h (modified) (1 diff)
• lib/network/monitor/network_stats_widget.h (modified) (2 diffs)
• world_entities/space_ships/hover.cc (modified) (1 diff)

branches/proxy/src/lib/gui/gl/Makefile.am

@@ -13 +13 @@
                 \
                 glgui_handler.cc \
+                glgui_widget.cc \
                 glgui_mainwidget.cc \
-                glgui_widget.cc \
                 glgui_button.cc \
                 glgui_pushbutton.cc \
@@ -41 +41 @@
                 glgui_defs.h \
                 glgui_handler.h \
+                glgui_widget.h \
                 glgui_mainwidget.h \
-                glgui_widget.h \
                 glgui_button.h \
                 glgui_pushbutton.h \

branches/proxy/src/lib/gui/gl/glgui.h

@@ -14 +14 @@
 #include "glgui_bar.h"
 #include "glgui_box.h"
+#include "glgui_fixedposition_box.h"
 #include "glgui_button.h"
 #include "glgui_checkbutton.h"

branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc

@@ -18 +18 @@
 #include "glgui_fixedposition_box.h"
 #include "glgui_handler.h"
+
 #include <cassert>
 
@@ -28 +29 @@
       : GLGuiBox(orientation)
   {}
-
-
-  /**
-   * standard deconstructor
-  */
-  GLGuiFixedpositionBox::~GLGuiFixedpositionBox()
-  {}
-
 
 

branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.h

@@ -18 +18 @@
   {
 
-  public:
-    GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);
-    virtual ~GLGuiFixedpositionBox();
+    public:
+      GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);
 
-    inline OrxGui::Position position() const { return this->_position; };
-    void setPosition(OrxGui::Position);
+      inline OrxGui::Position position() const { return this->_position; };
+      void setPosition(OrxGui::Position position);
 
+    protected:
+      virtual void resize();
 
-  protected:
-    virtual void resize();
-
-
-  private:
-    OrxGui::Position     _position;     //!< The Fixed position of the Widget.
+    private:
+      OrxGui::Position     _position;     //!< The Fixed position of the Widget.
   };
 }

branches/proxy/src/lib/network/monitor/network_stats_widget.h

@@ -20 +20 @@
   public:
     HostWidget(const std::string& name, const IP& ip);
-    ~HostWidget() {};
 
     void setName(const std::string& name) { this->_name.setText(name); };
@@ -71 +70 @@
 
 //! A class to display network Statistics.
-class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
+class NetworkStatsWidget : public OrxGui::GLGuiBox
 {
   public:

branches/proxy/src/world_entities/space_ships/hover.cc

@@ -282 +282 @@
   this->movement(dt);
   this->rotorCycle += this->rotorSpeed * dt;
+
+  this->debugNode(1);
 }