Changeset 7885 in orxonox.OLD

Timestamp:

May 27, 2006, 2:32:12 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: saver delete events

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui_cursor.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_handler.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (2 diffs)

branches/gui/src/lib/gui/gl_gui/glgui_cursor.cc

@@ -17 +17 @@
 
 #include "glgui_cursor.h"
+
+#include "glgui_handler.h"
 #include "color.h"
+
 
 namespace OrxGui
@@ -39 +42 @@
    */
   GLGuiCursor::~GLGuiCursor()
-  {}
+  {
+    GLGuiHandler::getInstance()->deactivateCursor(false);
+  }
 
   float GLGuiCursor::_mouseSensitivity = 1.0;

branches/gui/src/lib/gui/gl_gui/glgui_handler.cc

@@ -64 +64 @@
   }
 
-  void GLGuiHandler::deactivateCursor()
+  void GLGuiHandler::deactivateCursor(bool deleteCursor)
   {
     if (this->cursor)
     {
-      delete this->cursor;
+      if (deleteCursor)
+        delete this->cursor;
       this->cursor = NULL;
     }

branches/gui/src/lib/gui/gl_gui/glgui_handler.h

@@ -27 +27 @@
 
     void activateCursor();
-    void deactivateCursor();
+    void deactivateCursor(/** ignore param */ bool deleteCursor = true);
     GLGuiCursor* getCursor() const { return this->cursor; }
 

branches/gui/src/story_entities/simple_game_menu.cc

@@ -63 +63 @@
   this->selectorSource = NULL;
 
+
+  /// GUI
+  ///(this is as modular as it is possible).
   OrxGui::GLGuiPushButton* pb = new OrxGui::GLGuiPushButton("PUSH ME");
   pb->show();
@@ -76 +79 @@
   rdnpb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::quitMenu));
 
-
   OrxGui::GLGuiHandler::getInstance()->activateCursor();
-
+  /////
   if (root != NULL)
     this->loadParams(root);