From a20746422e13f06ab7be31eed2966bcfb677345c Mon Sep 17 00:00:00 2001
From: coppro <coppro@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Thu, 8 Nov 2007 04:26:48 +0000
Subject: [PATCH] More fixes for Mac.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@770 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 data/magic-future.mse-style/style | 3 ++-
 src/data/field/choice.hpp         | 1 +
 src/gui/value/choice.cpp          | 2 +-
 src/gui/value/multiple_choice.cpp | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style
index d3b9d98e..bf553936 100644
--- a/data/magic-future.mse-style/style
+++ b/data/magic-future.mse-style/style
@@ -1,4 +1,4 @@
-mse version: 0.3.5
+mse version: 0.3.5
 game: magic
 short name: Future
 full name: Futureshift
@@ -35,6 +35,7 @@ card dpi: 150
 
 init script:
 	mask_hybrid_with_land := { styling.grey_hybrid_name }
+	text_filter := { card.extra_data.paintbrush }
 	
 	template_suffix := [card: "card.jpg", pt: "pt.png", textbox: "textbox.png", typeline: "typeline.png"]
 	template := { input + template_suffix[type] }
diff --git a/src/data/field/choice.hpp b/src/data/field/choice.hpp
index bc33e8a6..ebbb0c44 100644
--- a/src/data/field/choice.hpp
+++ b/src/data/field/choice.hpp
@@ -16,6 +16,7 @@
 #include <gfx/gfx.hpp> // for ImageCombine
 #include <script/scriptable.hpp>
 #include <script/image.hpp>
+#include <wx/image.h>
 
 // ----------------------------------------------------------------------------- : ChoiceField
 
diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp
index 45e139d3..58908fe9 100644
--- a/src/gui/value/choice.cpp
+++ b/src/gui/value/choice.cpp
@@ -273,7 +273,7 @@ size_t DropDownChoiceList::selection() const {
 }
 
 DropDownList* DropDownChoiceList::createSubMenu(ChoiceField::ChoiceP group) const {
-	return new DropDownChoiceList(const_cast<DropDownChoiceList*>(this), true, cve, group);
+	return new DropDownChoiceList(static_cast<Window*>(const_cast<DropDownChoiceList*>(this)), true, cve, group);
 }
 
 // ----------------------------------------------------------------------------- : ChoiceValueEditor
diff --git a/src/gui/value/multiple_choice.cpp b/src/gui/value/multiple_choice.cpp
index c2e057ce..e5a32064 100644
--- a/src/gui/value/multiple_choice.cpp
+++ b/src/gui/value/multiple_choice.cpp
@@ -82,7 +82,7 @@ size_t DropDownMultipleChoiceList::selection() const {
 }
 
 DropDownList* DropDownMultipleChoiceList::createSubMenu(ChoiceField::ChoiceP group) const {
-	return new DropDownMultipleChoiceList(const_cast<DropDownMultipleChoiceList*>(this), true, cve, group);
+	return new DropDownMultipleChoiceList(static_cast<Window*>(const_cast<DropDownMultipleChoiceList*>(this)), true, cve, group);
 }
 
 // ----------------------------------------------------------------------------- : MultipleChoiceValueEditor