Changeset 9675 for code/trunk/src/libraries/core/GUIManager.h
- Timestamp:
- Sep 26, 2013, 11:03:33 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libs (added) merged: 9668-9671
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/core/GUIManager.h
r9667 r9675 40 40 #include <map> 41 41 #include <string> 42 #include <CEGUIForwardRefs.h> 43 #include <CEGUIVersion.h> 42 43 #if CEGUI_VERSION >= 0x000800 44 # include <CEGUI/ForwardRefs.h> 45 # include <CEGUI/Version.h> 46 #else 47 # include <CEGUIForwardRefs.h> 48 # include <CEGUIVersion.h> 49 #endif 50 44 51 #include <boost/shared_ptr.hpp> 45 52 … … 149 156 void executeCode(const std::string& str); 150 157 158 template <typename FunctionType, typename ObjectType> 159 bool protectedCall(FunctionType function, ObjectType object); 160 151 161 template <typename FunctionType> 152 bool protectedCall(FunctionType function); 162 bool protectedCeguiSystemCall(FunctionType function); 163 164 #if CEGUI_VERSION >= 0x000800 165 template <typename FunctionType> 166 bool protectedCeguiContextCall(FunctionType function); 167 #endif 153 168 154 169 void changedCeguiOutputLevel();
Note: See TracChangeset
for help on using the changeset viewer.