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

@@ -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] }

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
 

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

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