Changeset 6150 for code/branches/presentation2/src/modules/overlays/GUIOverlay.cc

Timestamp:

Nov 25, 2009, 4:52:37 PM (15 years ago)

Author:

scheusso

Message:

merged menu branch to presentation2 branch with some additional fixes and features

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/modules/overlays/GUIOverlay.cc (modified) (2 diffs)

code/branches/presentation2/src/modules/overlays/GUIOverlay.cc

@@ -73 +73 @@
             out << reinterpret_cast<long>(this);
             str = out.str();
-            GUIManager::getInstance().executeCode("showCursor()");
-            InputManager::getInstance().enterState("guiMouseOnly");
-            GUIManager::getInstance().executeCode("showGUI(\"" + this->guiName_ + "\", " + str + ")");
+            COUT(1) << "GUIManager ptr: " << str << std::endl;
+            GUIManager::getInstance().showGUIExtra(this->guiName_, str);
 
             COUT(3) << "Showing GUI " << this->guiName_ << std::endl;
@@ -81 +80 @@
         else
         {
-            GUIManager::getInstance().executeCode("hideGUI(\"" + this->guiName_ + "\")");
-            GUIManager::getInstance().executeCode("hideCursor()");
-            InputManager::getInstance().leaveState("guiMouseOnly");
+            GUIManager::hideGUI(this->guiName_);
             COUT(3) << "Hiding GUI " << this->guiName_ << std::endl;
         }