Support for extra card fields in stylesheets;

Fixed some bugs:
 - Missing choice images can crash mse.
 - The wrong style is used for making preview choice images on style panel.
FOR_EACH(x, *y.z) should now work without parentheses on linux as well.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@389 0fc631ac-6414-0410-93d0-97cfa31319b6

src/util/error.cpp

@@ -55,10 +55,12 @@ vector<String> previous_errors;
 String pending_errors;
 String pending_warnings;
 DECLARE_TYPEOF_COLLECTION(String);
+wxCriticalSection crit_error_handling;
 
 void handle_error(const String& e, bool allow_duplicate = true, bool now = true) {
+	// Thread safety
+	wxCriticalSectionLocker lock(crit_error_handling);
 	// Check duplicates
-	// TODO: thread safety
 	if (!allow_duplicate) {
 		FOR_EACH(pe, previous_errors) {
 			if (e == pe) return;

src/util/for_each.hpp

@@ -26,12 +26,12 @@
 	#define DECLARE_TYPEOF_COLLECTION(T)
 	
 	#define TYPEOF(Value)      __typeof(Value)
-	#define TYPEOF_IT(Value)   __typeof(Value.begin())
-	#define TYPEOF_CIT(Value)  __typeof(Value.begin())
-	#define TYPEOF_RIT(Value)  __typeof(Value.rbegin())
-	#define TYPEOF_CRIT(Value) __typeof(Value.rbegin())
-	#define TYPEOF_REF(Value)  __typeof(*Value.begin())&
-	#define TYPEOF_CREF(Value) __typeof(*Value.begin())&
+	#define TYPEOF_IT(Value)   __typeof((Value).begin())
+	#define TYPEOF_CIT(Value)  __typeof((Value).begin())
+	#define TYPEOF_RIT(Value)  __typeof((Value).rbegin())
+	#define TYPEOF_CRIT(Value) __typeof((Value).rbegin())
+	#define TYPEOF_REF(Value)  __typeof(*(Value).begin())&
+	#define TYPEOF_CREF(Value) __typeof(*(Value).begin())&
 	
 #else
 	/// Helper for typeof tricks

src/util/index_map.hpp

@@ -43,8 +43,8 @@ class IndexMap : private vector<Value> {
 	
 	/// Initialize this map with default values given a list of keys
 	/** has no effect if already initialized with the given keys */
-	void init(const vector<Key>& keys) {
-		if (this->size() == keys.size()) return;
+	bool init(const vector<Key>& keys) {
+		if (this->size() == keys.size() && (this->empty() || get_key(this->front()) == keys.front())) return false;
 		this->reserve(keys.size());
 		for(typename vector<Key>::const_iterator it = keys.begin() ; it != keys.end() ; ++it) {
 			const Key& key = *it;
@@ -52,6 +52,7 @@ class IndexMap : private vector<Value> {
 			if (key->index >= this->size()) this->resize(key->index + 1);
 			init_object(key, (*this)[key->index]);
 		}
+		return true;
 	}
 	/// Initialize this map with cloned values from another list
 	void cloneFrom(const IndexMap<Key,Value>& values) {
@@ -75,6 +76,14 @@ class IndexMap : private vector<Value> {
 		assert(this->size() > key->index);
 		return at(key->index);
 	}
+	/// Retrieve a value given its key, if it matches
+	inline Value tryGet (const Key& key) {
+		assert(key);
+		if (this->size() <= key->index) return Value();
+		Value v = at(key->index);
+		if (get_key(v) != key) return Value();
+		return v;
+	}
 	
 	/// Is a value contained in this index map?
 	inline bool contains(const Value& value) const {