Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7885 in orxonox.OLD for branches/gui


Ignore:
Timestamp:
May 27, 2006, 2:32:12 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: saver delete events

Location:
branches/gui/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/gui/src/lib/gui/gl_gui/glgui_cursor.cc

    r7879 r7885  
    1717
    1818#include "glgui_cursor.h"
     19
     20#include "glgui_handler.h"
    1921#include "color.h"
     22
    2023
    2124namespace OrxGui
     
    3942   */
    4043  GLGuiCursor::~GLGuiCursor()
    41   {}
     44  {
     45    GLGuiHandler::getInstance()->deactivateCursor(false);
     46  }
    4247
    4348  float GLGuiCursor::_mouseSensitivity = 1.0;
  • branches/gui/src/lib/gui/gl_gui/glgui_handler.cc

    r7884 r7885  
    6464  }
    6565
    66   void GLGuiHandler::deactivateCursor()
     66  void GLGuiHandler::deactivateCursor(bool deleteCursor)
    6767  {
    6868    if (this->cursor)
    6969    {
    70       delete this->cursor;
     70      if (deleteCursor)
     71        delete this->cursor;
    7172      this->cursor = NULL;
    7273    }
  • branches/gui/src/lib/gui/gl_gui/glgui_handler.h

    r7880 r7885  
    2727
    2828    void activateCursor();
    29     void deactivateCursor();
     29    void deactivateCursor(/** ignore param */ bool deleteCursor = true);
    3030    GLGuiCursor* getCursor() const { return this->cursor; }
    3131
  • branches/gui/src/story_entities/simple_game_menu.cc

    r7884 r7885  
    6363  this->selectorSource = NULL;
    6464
     65
     66  /// GUI
     67  ///(this is as modular as it is possible).
    6568  OrxGui::GLGuiPushButton* pb = new OrxGui::GLGuiPushButton("PUSH ME");
    6669  pb->show();
     
    7679  rdnpb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::quitMenu));
    7780
    78 
    7981  OrxGui::GLGuiHandler::getInstance()->activateCursor();
    80 
     82  /////
    8183  if (root != NULL)
    8284    this->loadParams(root);
Note: See TracChangeset for help on using the changeset viewer.