Changeset 7801 for code/trunk/src/libraries/core/GUIManager.h
- Timestamp:
- Dec 22, 2010, 7:24:24 PM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/core/GUIManager.h
r7648 r7801 49 49 #include "util/Singleton.h" 50 50 #include "input/InputHandler.h" 51 #include "OrxonoxClass.h" 51 52 52 53 // Tolua includes (have to be relative to the current directory) … … 70 71 */ 71 72 class _CoreExport GUIManager // tolua_export 72 : public Singleton<GUIManager>, public InputHandler 73 : public Singleton<GUIManager>, public InputHandler, public OrxonoxClass 73 74 { // tolua_export 74 75 friend class Singleton<GUIManager>; … … 76 77 GUIManager(const std::pair<int, int>& mousePosition); 77 78 ~GUIManager(); 79 80 void setConfigValues(void); 81 void changedGUIScheme(void); 78 82 79 83 void preUpdate(const Clock& time); … … 143 147 static GUIManager* singletonPtr_s; //!< Singleton reference to GUIManager 144 148 149 // The used CEGUI scheme. 150 static const std::string defaultScheme_; 151 std::string guiScheme_; 152 145 153 }; // tolua_export 146 154 } // tolua_export
Note: See TracChangeset
for help on using the changeset viewer.