Changeset 7967 for code/branches
- Timestamp:
- Feb 26, 2011, 5:12:43 PM (14 years ago)
- Location:
- code/branches/kicklib/src/libraries/core
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib/src/libraries/core/GUIManager.cc
r7961 r7967 46 46 #include <elements/CEGUIListboxItem.h> 47 47 48 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 748 #ifdef CEGUI_OLD_VERSION 49 49 # include <CEGUILua.h> 50 50 # include <ogreceguirenderer/OgreCEGUIRenderer.h> … … 93 93 case CEGUI::Informative: orxonoxLevel = 5; break; 94 94 case CEGUI::Insane: orxonoxLevel = 6; break; 95 default: OrxAssert(false, "CEGUI log level out of range, in pect immediately!");95 default: OrxAssert(false, "CEGUI log level out of range, inspect immediately!"); 96 96 } 97 97 OutputHandler::getOutStream(orxonoxLevel) … … 127 127 , guiSystem_(NULL) 128 128 , resourceProvider_(NULL) 129 #if CEGUI_VERSION_MAJOR >= 1 || CEGUI_VERSION_MINOR >= 7129 #ifdef CEGUI_OLD_VERSION 130 130 , imageCodec_(NULL) 131 131 #endif … … 140 140 141 141 // Note: No SceneManager specified yet 142 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7142 #ifdef CEGUI_OLD_VERSION 143 143 guiRenderer_ = new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000); 144 144 resourceProvider_ = guiRenderer_->createResourceProvider(); … … 155 155 // This is necessary to ensure that input events also use the right resource info when triggering lua functions 156 156 luaState_->setDefaultResourceInfo(this->rootFileInfo_); 157 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7157 #ifdef CEGUI_OLD_VERSION 158 158 scriptModule_ = new LuaScriptModule(luaState_->getInternalLuaState()); 159 159 #else … … 171 171 172 172 // Create the CEGUI system singleton 173 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7173 #ifdef CEGUI_OLD_VERSION 174 174 guiSystem_ = new System(guiRenderer_, resourceProvider_, 0, scriptModule_); 175 175 // Add functions that have been renamed in newer versions … … 207 207 using namespace CEGUI; 208 208 209 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7209 #ifdef CEGUI_OLD_VERSION 210 210 delete guiSystem_; 211 211 delete guiRenderer_; … … 260 260 { 261 261 this->camera_ = camera; 262 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7262 #ifdef CEGUI_OLD_VERSION 263 263 if (camera == NULL) 264 264 this->guiRenderer_->setTargetSceneManager(0); … … 539 539 The Listbox for which to enable (or disable) tooltips. 540 540 @param enabled 541 Whether to enable or disab elthe tooltips.541 Whether to enable or disable the tooltips. 542 542 */ 543 543 void GUIManager::setItemTooltipsEnabledHelper(CEGUI::Listbox* listbox, bool enabled) … … 551 551 void GUIManager::windowResized(unsigned int newWidth, unsigned int newHeight) 552 552 { 553 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7553 #ifdef CEGUI_OLD_VERSION 554 554 this->guiRenderer_->setDisplaySize(CEGUI::Size(newWidth, newHeight)); 555 555 #else … … 559 559 560 560 /** 561 @brief Notify CEGUI if the windows loses the focus (stops hig light of menu items, etc).561 @brief Notify CEGUI if the windows loses the focus (stops highlight of menu items, etc). 562 562 */ 563 563 void GUIManager::windowFocusChanged(bool bFocus) -
code/branches/kicklib/src/libraries/core/GUIManager.h
r7965 r7967 57 57 $cfile "../util/TriBool.h" // tolua_export 58 58 */ 59 60 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7 61 # define CEGUI_OLD_VERSION 62 #endif 59 63 60 64 namespace orxonox // tolua_export … … 149 153 Loki::ObjScopeGuardImpl0<GUIManager, void (GUIManager::*)()> destroyer_; 150 154 151 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7155 #ifdef CEGUI_OLD_VERSION 152 156 CEGUI::OgreCEGUIRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine 153 157 CEGUI::ResourceProvider* resourceProvider_; //!< CEGUI's resource provider
Note: See TracChangeset
for help on using the changeset viewer.