Changeset 9671 for code/branches/libs/src/libraries/core/GUIManager.h

Timestamp:

Sep 8, 2013, 7:30:20 PM (11 years ago)

Author:

landauf

Message:

adjusted code to compile with cegui 0.8 and 0.7. see www.cegui.org.uk/wiki/index.php/Changes_and_Porting_Tips_for_0.8.0

doesn't run yet (lua scripts fail)

File:

• code/branches/libs/src/libraries/core/GUIManager.h (modified) (1 diff)

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

@@ -156 +156 @@
         void executeCode(const std::string& str);
 
+        template <typename FunctionType, typename ObjectType>
+        bool protectedCall(FunctionType function, ObjectType object);
+
         template <typename FunctionType>
-        bool protectedCall(FunctionType function);
+        bool protectedCeguiSystemCall(FunctionType function);
+
+#if CEGUI_VERSION >= 0x000800
+        template <typename FunctionType>
+        bool protectedCeguiContextCall(FunctionType function);
+#endif
 
         void changedCeguiOutputLevel();