Merge with local code.

1 files changed, 5 insertions, 1 deletions

diff --git a/server/src/macro.h b/server/src/macro.h
index 2252d90..9d4692f 100644
--- a/server/src/macro.h
+++ b/server/src/macro.h
@@ -29,13 +29,17 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
+/*
 class WidgetProperty {
 public:
   std::string name;
   std::string value;
 };
-typedef std::vector< WidgetProperty > WidgetPropertyList; 
+*/
+//typedef std::vector< WidgetProperty > WidgetPropertyList; 
+typedef std::map< std::string, std::string > WidgetPropertyList;
 
 class Widget;
 typedef std::vector< Widget > WidgetList;