Changeset 8073 for code/branches/kicklib/src/libraries/core

Timestamp:

Mar 14, 2011, 4:08:06 AM (13 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/DynLib.h (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (3 diffs)
• src/libraries/core/GraphicsManager.cc (modified) (2 diffs)
• src/libraries/core/PathConfig.cc (modified) (1 diff)

code/branches/kicklib/src/libraries/core/DynLib.h

@@ -110 +110 @@
 
     protected:
+
         /// Handle to the loaded library.
         DYNLIB_HANDLE m_hInst;

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)));
     }

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

@@ -269 +269 @@
 
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
-                
+
 // HACK
 #ifdef ORXONOX_PLATFORM_APPLE
@@ -278 +278 @@
 #endif
 // End of HACK
-                
+
         // create a full screen default viewport
         // Note: This may throw when adding a viewport with an existing z-order!

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

@@ -208 +208 @@
 #ifdef ORXONOX_PLATFORM_UNIX
             char* userDataPathPtr(getenv("HOME"));
-#elif ORXONOX_PLATFORM_APPLE
-            char* userDataPathPtr(getenv("HOME"));
 #else
             char* userDataPathPtr(getenv("APPDATA"));