Changeset 7885 in orxonox.OLD for branches/gui
- Timestamp:
- May 27, 2006, 2:32:12 AM (19 years ago)
- Location:
- branches/gui/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gui/src/lib/gui/gl_gui/glgui_cursor.cc
r7879 r7885 17 17 18 18 #include "glgui_cursor.h" 19 20 #include "glgui_handler.h" 19 21 #include "color.h" 22 20 23 21 24 namespace OrxGui … … 39 42 */ 40 43 GLGuiCursor::~GLGuiCursor() 41 {} 44 { 45 GLGuiHandler::getInstance()->deactivateCursor(false); 46 } 42 47 43 48 float GLGuiCursor::_mouseSensitivity = 1.0; -
branches/gui/src/lib/gui/gl_gui/glgui_handler.cc
r7884 r7885 64 64 } 65 65 66 void GLGuiHandler::deactivateCursor( )66 void GLGuiHandler::deactivateCursor(bool deleteCursor) 67 67 { 68 68 if (this->cursor) 69 69 { 70 delete this->cursor; 70 if (deleteCursor) 71 delete this->cursor; 71 72 this->cursor = NULL; 72 73 } -
branches/gui/src/lib/gui/gl_gui/glgui_handler.h
r7880 r7885 27 27 28 28 void activateCursor(); 29 void deactivateCursor( );29 void deactivateCursor(/** ignore param */ bool deleteCursor = true); 30 30 GLGuiCursor* getCursor() const { return this->cursor; } 31 31 -
branches/gui/src/story_entities/simple_game_menu.cc
r7884 r7885 63 63 this->selectorSource = NULL; 64 64 65 66 /// GUI 67 ///(this is as modular as it is possible). 65 68 OrxGui::GLGuiPushButton* pb = new OrxGui::GLGuiPushButton("PUSH ME"); 66 69 pb->show(); … … 76 79 rdnpb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::quitMenu)); 77 80 78 79 81 OrxGui::GLGuiHandler::getInstance()->activateCursor(); 80 82 ///// 81 83 if (root != NULL) 82 84 this->loadParams(root);
Note: See TracChangeset
for help on using the changeset viewer.