[Orxonox-commit 949] r5672 - in code/branches/resource2/src/core: . input

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-24 10:12:45 +0200 (Mon, 24 Aug 2009)
New Revision: 5672

Modified:
   code/branches/resource2/src/core/GUIManager.cc
   code/branches/resource2/src/core/input/InputManager.cc
Log:
Forgot to remove windows conditional compilation.

Modified: code/branches/resource2/src/core/GUIManager.cc
===================================================================
--- code/branches/resource2/src/core/GUIManager.cc	2009-08-24 08:10:05 UTC (rev 5671)
+++ code/branches/resource2/src/core/GUIManager.cc	2009-08-24 08:12:45 UTC (rev 5672)
@@ -131,11 +131,9 @@
         // Align CEGUI mouse with OIS mouse
         guiSystem_->injectMousePosition(mousePosition.first, mousePosition.second);
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
         // Hide the mouse cursor unless playing in fullscreen mode
         if (!bFullScreen)
             CEGUI::MouseCursor::getSingleton().hide();
-#endif
     }
 
     /**

Modified: code/branches/resource2/src/core/input/InputManager.cc
===================================================================
--- code/branches/resource2/src/core/input/InputManager.cc	2009-08-24 08:10:05 UTC (rev 5671)
+++ code/branches/resource2/src/core/input/InputManager.cc	2009-08-24 08:12:45 UTC (rev 5672)
@@ -524,7 +524,6 @@
         for (std::set<InputState*>::const_iterator it = tempSet.begin();it != tempSet.end(); ++it)
             activeStatesTicked_.push_back(*it);
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
         // Check whether we have to change the mouse mode
         std::vector<InputState*>& mouseStates = devices_[InputDeviceEnumerator::Mouse]->getStateListRef();
         if (mouseStates.empty() && bExclusiveMouse_ ||
@@ -534,7 +533,6 @@
             if (!GraphicsManager::getInstance().isFullScreen())
                 this->reloadInternal();
         }
-#endif
     }
 
     void InputManager::clearBuffers()