X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2Fsystem.h;h=012a5bfcb277f36cbb6f6242464b851d810e7d1d;hb=825f47d7d281a359e9fec03de88e7db58e9e49ff;hp=6aea190265aa194dbbbb645aeeec8bc9b2924f48;hpb=c1b7d6e874f1bfcac251e852ae37229c12c61656;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
index 6aea190..012a5bf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
@@ -2,8 +2,8 @@
  * @file system.h
  * @brief Contains a system typedefs used to reuse code.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-19
-*/
+ * @date  2011-06-02
+ */
 
 #ifndef SYSTEM_H_
 #define SYSTEM_H_
@@ -11,6 +11,8 @@
 #include <list>
 #include <map>
 #include <iostream>
+#include <exception>
+#include <string>
 #include "functor.h"
 
 /*!	@namespace <creaButtonContainer>
@@ -18,6 +20,12 @@
  */
 namespace creaButtonContainer
 {
+	// ----------------------------------------------------------------------------------
+	/*!	@typedef std::string* StringType;
+	 *	@brief Defines the StringType type.
+	 */
+	typedef std::string StringType;
+	// ----------------------------------------------------------------------------------
 	/*!	@typedef model::TFunctor* FunctionEventType;
 	 *	@brief Defines the FunctionEventType type.
 	 */
@@ -27,13 +35,13 @@ namespace creaButtonContainer
 	 *	@brief Defines the ActionButton type.
 	 *	First is the button description, Second FunctionEventType
 	 */
-	typedef std::pair< std::string, FunctionEventType > ButtonAction;
+	typedef std::pair< StringType, FunctionEventType > ButtonAction;
 	// ----------------------------------------------------------------------------------
 	/*!	@typedef std::pair< std::string, std::string > ButtonInfo;
 	 *	@brief Defines the ButtonInfo type.
 	 *	First is the ButtonName and Second is the IconPath
 	 */
-	typedef std::pair< std::string, std::string > ButtonInfo;
+	typedef std::pair< StringType, StringType > ButtonInfo;
 	// ----------------------------------------------------------------------------------
 	/*!	@typedef std::pair< ButtonInfo*, ActionButton* > ButtonPair;
 	 *	@brief Defines the ButtonPair type.
@@ -43,7 +51,7 @@ namespace creaButtonContainer
 	/*!	@typedef std::list< std::string > KeyMapList;
 	 *	@brief Defines the KeyMapList type.
 	 */
-	typedef std::list< std::string > KeyMapList;
+	typedef std::list< StringType > KeyMapList;
 	// ----------------------------------------------------------------------------------
 	/*!	@typedef std::list< ButtonPair* > ButtonList;
 	 *	@brief Defines the ButtonList type.
@@ -53,7 +61,7 @@ namespace creaButtonContainer
 	/*!	@typedef std::map< std::string, ButtonList > ButtonGroupMap;
 	 *	@brief Defines the ButtonGroupMap type.
 	 */
-	typedef std::map< std::string, ButtonList > ButtonGroupMap;
+	typedef std::map< StringType, ButtonList > ButtonGroupMap;
 // ----------------------------------------------------------------------------------
 }