Reverted resource references for combine_something, you can't use tool_image here, because on MSW that only works for .bmps'

Added dependency stuff to invalidate Choice images;
Fixed 'duplicate' in symbol editor

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

src/data/field/choice.cpp

@@ -167,19 +167,15 @@ ChoiceStyle::ChoiceStyle(const ChoiceFieldP& field)
 	, combine(COMBINE_NORMAL)
 	, alignment(ALIGN_STRETCH)
 	, thumbnails(nullptr)
+	, thumbnail_age(1) // thumbnails were made before the beginning of time
+	, invalidated_images(false)
 {}
 
 ChoiceStyle::~ChoiceStyle() {
 	delete thumbnails;
 }
 
-// TODO
-/*
-void ChoiceStyle::invalidate() {
-	// rebuild choice images
-}
 
-*/
 bool ChoiceStyle::update(Context& ctx) {
 	// Don't update the choice images, leave that to invalidate()
 	return Style::update(ctx);
@@ -190,6 +186,18 @@ void ChoiceStyle::initDependencies(Context& ctx, const Dependency& dep) const {
 		ci.second.initDependencies(ctx, dep);
 	}
 }
+void ChoiceStyle::invalidate() {
+	// rebuild choice images
+	// TODO: Don't use this; rely on upToDate() instead
+	FOR_EACH(ci, choice_images) {
+		// TODO : only invalidate images that actually have dependencies
+		ci.second.invalidate();
+	}
+	if (thumbnails) {
+		thumbnails->RemoveAll();
+	}
+	invalidated_images = true;
+}
 
 void ChoiceStyle::loadMask(Package& pkg) {
 	if (mask.Ok() || mask_filename.empty()) return;