Changeset 7967 for code/branches/kicklib/src/libraries/core/GUIManager.h

Timestamp:

Feb 26, 2011, 5:12:43 PM (13 years ago)

Author:

rgrieder

Message:

Cleaned up macro monstrosities in GUIManager and fixed some typos.

File:

• code/branches/kicklib/src/libraries/core/GUIManager.h (modified) (2 diffs)

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

@@ -57 +57 @@
 $cfile "../util/TriBool.h" // tolua_export
 */
+
+#if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7
+#  define CEGUI_OLD_VERSION
+#endif
 
 namespace orxonox // tolua_export
@@ -149 +153 @@
         Loki::ObjScopeGuardImpl0<GUIManager, void (GUIManager::*)()> destroyer_;
 
-#if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7
+#ifdef CEGUI_OLD_VERSION
         CEGUI::OgreCEGUIRenderer*            guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
         CEGUI::ResourceProvider*             resourceProvider_; //!< CEGUI's resource provider