Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9549 in orxonox.OLD for branches/proxy


Ignore:
Timestamp:
Jul 28, 2006, 11:43:02 AM (18 years ago)
Author:
bensch
Message:

should link

Location:
branches/proxy/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/gui/gl/Makefile.am

    r9546 r9549  
    1313                \
    1414                glgui_handler.cc \
     15                glgui_widget.cc \
    1516                glgui_mainwidget.cc \
    16                 glgui_widget.cc \
    1717                glgui_button.cc \
    1818                glgui_pushbutton.cc \
     
    4141                glgui_defs.h \
    4242                glgui_handler.h \
     43                glgui_widget.h \
    4344                glgui_mainwidget.h \
    44                 glgui_widget.h \
    4545                glgui_button.h \
    4646                glgui_pushbutton.h \
  • branches/proxy/src/lib/gui/gl/glgui.h

    r9015 r9549  
    1414#include "glgui_bar.h"
    1515#include "glgui_box.h"
     16#include "glgui_fixedposition_box.h"
    1617#include "glgui_button.h"
    1718#include "glgui_checkbutton.h"
  • branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc

    r9547 r9549  
    1818#include "glgui_fixedposition_box.h"
    1919#include "glgui_handler.h"
     20
    2021#include <cassert>
    2122
     
    2829      : GLGuiBox(orientation)
    2930  {}
    30 
    31 
    32   /**
    33    * standard deconstructor
    34   */
    35   GLGuiFixedpositionBox::~GLGuiFixedpositionBox()
    36   {}
    37 
    3831
    3932
  • branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.h

    r9547 r9549  
    1818  {
    1919
    20   public:
    21     GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);
    22     virtual ~GLGuiFixedpositionBox();
     20    public:
     21      GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);
    2322
    24     inline OrxGui::Position position() const { return this->_position; };
    25     void setPosition(OrxGui::Position);
     23      inline OrxGui::Position position() const { return this->_position; };
     24      void setPosition(OrxGui::Position position);
    2625
     26    protected:
     27      virtual void resize();
    2728
    28   protected:
    29     virtual void resize();
    30 
    31 
    32   private:
    33     OrxGui::Position     _position;     //!< The Fixed position of the Widget.
     29    private:
     30      OrxGui::Position     _position;     //!< The Fixed position of the Widget.
    3431  };
    3532}
  • branches/proxy/src/lib/network/monitor/network_stats_widget.h

    r9547 r9549  
    2020  public:
    2121    HostWidget(const std::string& name, const IP& ip);
    22     ~HostWidget() {};
    2322
    2423    void setName(const std::string& name) { this->_name.setText(name); };
     
    7170
    7271//! A class to display network Statistics.
    73 class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
     72class NetworkStatsWidget : public OrxGui::GLGuiBox
    7473{
    7574  public:
  • branches/proxy/src/world_entities/space_ships/hover.cc

    r9235 r9549  
    282282  this->movement(dt);
    283283  this->rotorCycle += this->rotorSpeed * dt;
     284
     285  this->debugNode(1);
    284286}
    285287
Note: See TracChangeset for help on using the changeset viewer.