Changeset 8073 for code/branches/kicklib/src/libraries/core/GUIManager.cc

Timestamp:

Mar 14, 2011, 4:08:06 AM (14 years ago)

Author:

rgrieder

Message:

Merged mac_osx branch (after renaming it from ois_update) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/libraries/core/GUIManager.cc (modified) (3 diffs)

code/branches/kicklib/src/libraries/core/GUIManager.cc

@@ -369 +369 @@
         false                     | False | True  | Dontcare
         */
+
+#ifdef ORXONOX_PLATFORM_APPLE
+        // There is no non exclusive mode on OS X yet
+        state->setMouseExclusive(TriBool::True);
+#else
         if (showCursor == TriBool::Dontcare)
             state->setMouseExclusive(TriBool::Dontcare);
@@ -375 +380 @@
         else
             state->setMouseExclusive(TriBool::False);
+#endif
 
         if (showCursor == TriBool::True)
@@ -436 +442 @@
     void GUIManager::buttonPressed(MouseButtonCode::ByEnum id)
     {
-        //guiSystem_->injectMouseButtonDown(convertButton(id));
         this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonDown, _1, convertButton(id)));
     }