Fixed some more compiler warnings

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

Makefile

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20,6 +20,8 @@
 #| License:      GNU General Public License 2 or later (see file COPYING)     |
 #+----------------------------------------------------------------------------+
 
+SOURCES = $(magicseteditor_SOURCES)
+
 srcdir = .
 top_srcdir = .
 
@@ -42,10 +44,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = magicseteditor$(EXEEXT)
 subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/src/config.h.in COPYING TODO depcomp install-sh \
-	missing
+	$(top_srcdir)/src/config.h.in AUTHORS COPYING ChangeLog \
+	INSTALL NEWS TODO depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -191,13 +193,13 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/twanvl/mse/missing --run aclocal-1.9
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run automake-1.9
+AMTAR = ${SHELL} /home/twanvl/mse/missing --run tar
+AUTOCONF = ${SHELL} /home/twanvl/mse/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/twanvl/mse/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/twanvl/mse/missing --run automake-1.9
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -213,9 +215,8 @@ DEPDIR = .deps
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /bin/grep -E
+EGREP = grep -E
 EXEEXT = 
-GREP = /bin/grep
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -224,7 +225,7 @@ LDFLAGS =
 LIBOBJS = 
 LIBS = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/twanvl/mse/missing --run makeinfo
 OBJEXT = o
 PACKAGE = magicseteditor
 PACKAGE_BUGREPORT = twanvl@users.sourceforge.net
@@ -234,20 +235,21 @@ PACKAGE_TARNAME = magicseteditor
 PACKAGE_VERSION = 0.3.0
 PATH_SEPARATOR = :
 SET_MAKE = 
-SHELL = /bin/bash
+SHELL = /bin/sh
 STRIP = 
 VERSION = 0.3.0
-WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA 
+WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA 
 WX_CFLAGS_ONLY = 
 WX_CONFIG_PATH = /usr/bin/wx-config
-WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
-WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA  
-WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
+WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
+WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA  
+WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
 WX_LIBS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 
-WX_LIBS_STATIC =  -pthread    /usr/lib/libwx_gtk-2.4.a -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXi -lXext -lX11 -lm -lpng -ljpeg -ltiff -lz -ldl -lm 
-WX_VERSION = 2.6.3
+WX_LIBS_STATIC = 
+WX_VERSION = 2.6.1
 ac_ct_CC = gcc
 ac_ct_CXX = g++
+ac_ct_STRIP = 
 am__fastdepCC_FALSE = #
 am__fastdepCC_TRUE = 
 am__fastdepCXX_FALSE = #
@@ -259,27 +261,20 @@ am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
 build_alias = 
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
+datadir = ${prefix}/share
 exec_prefix = ${prefix}
 host_alias = 
-htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = /home/coppro/C++/MSE/trunk/install-sh
+infodir = ${prefix}/info
+install_sh = /home/twanvl/mse/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
+mandir = ${prefix}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
-pdfdir = ${docdir}
 prefix = /usr/local
 program_transform_name = s,x,x,
-psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
@@ -287,7 +282,7 @@ target_alias =
 
 # This flag allows us to use subdirectories:
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA   -DUNICODE -I . -Wall
+AM_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA   -DUNICODE -I . -Wall
 AM_LDFLAGS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 
 
 # List of source files, generated using:
@@ -440,389 +435,399 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-src/gfx/$(am__dirstamp):
+./src/gfx/$(am__dirstamp):
 	@$(mkdir_p) ./src/gfx
-	@: > src/gfx/$(am__dirstamp)
-src/gfx/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/gfx/$(am__dirstamp)
+./src/gfx/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gfx/$(DEPDIR)
-	@: > src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/color.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/bezier.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/blend_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/resample_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/resample_text.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/image_effects.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/rotate_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/combine_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/polynomial.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/mask_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	src/gfx/$(DEPDIR)/$(am__dirstamp)
-src/gui/set/$(am__dirstamp):
+	@: > ./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/color.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/bezier.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/blend_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/resample_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/resample_text.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/image_effects.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/rotate_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/combine_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/polynomial.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/mask_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/set
-	@: > src/gui/set/$(am__dirstamp)
-src/gui/set/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/gui/set/$(am__dirstamp)
+./src/gui/set/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/set/$(DEPDIR)
-	@: > src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/stats_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/set_info_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/style_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/keywords_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/window.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/cards_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-src/gui/control/$(am__dirstamp):
+	@: > ./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/stats_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
+	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
+	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/set_info_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
+	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/style_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
+	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/keywords_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
+	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/window.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
+	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/cards_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
+	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/control/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/control
-	@: > src/gui/control/$(am__dirstamp)
-src/gui/control/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/gui/control/$(am__dirstamp)
+./src/gui/control/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/control/$(DEPDIR)
-	@: > src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_viewer.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/filtered_card_list.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/select_card_list.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/package_list.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/gallery_list.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/graph.$(OBJEXT): src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+./src/gui/control/graph.$(OBJEXT): ./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/image_card_list.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_list.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_list_column_select.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/native_look_editor.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_editor.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/text_ctrl.$(OBJEXT):  \
-	src/gui/control/$(am__dirstamp) \
-	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-src/gui/$(am__dirstamp):
+	./src/gui/control/$(am__dirstamp) \
+	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+./src/gui/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui
-	@: > src/gui/$(am__dirstamp)
-src/gui/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/gui/$(am__dirstamp)
+./src/gui/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/$(DEPDIR)
-	@: > src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/preferences_window.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/drop_down_list.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/card_select_window.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/welcome_window.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-src/gui/value/$(am__dirstamp):
+	@: > ./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/preferences_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/drop_down_list.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/card_select_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/welcome_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/value
-	@: > src/gui/value/$(am__dirstamp)
-src/gui/value/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/gui/value/$(am__dirstamp)
+./src/gui/value/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/value/$(DEPDIR)
-	@: > src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/color.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/symbol.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/color.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/symbol.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/value/multiple_choice.$(OBJEXT):  \
-	src/gui/value/$(am__dirstamp) \
-	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/choice.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/text.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/image.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/editor.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/image_slice_window.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/thumbnail_thread.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/print_window.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/about_window.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-src/gui/symbol/$(am__dirstamp):
+	./src/gui/value/$(am__dirstamp) \
+	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/choice.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/text.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/image.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/editor.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/image_slice_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/thumbnail_thread.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/print_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/about_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/symbol
-	@: > src/gui/symbol/$(am__dirstamp)
-src/gui/symbol/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/gui/symbol/$(am__dirstamp)
+./src/gui/symbol/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/symbol/$(DEPDIR)
-	@: > src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/point_editor.$(OBJEXT):  \
-	src/gui/symbol/$(am__dirstamp) \
-	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/symbol/$(am__dirstamp) \
+	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/basic_shape_editor.$(OBJEXT):  \
-	src/gui/symbol/$(am__dirstamp) \
-	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/control.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
-	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	./src/gui/symbol/$(am__dirstamp) \
+	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/control.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
+	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/select_editor.$(OBJEXT):  \
-	src/gui/symbol/$(am__dirstamp) \
-	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/editor.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
-	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/part_list.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
-	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/window.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
-	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/update_checker.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/new_window.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/icon_menu.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/util.$(OBJEXT): src/gui/$(am__dirstamp) \
-	src/gui/$(DEPDIR)/$(am__dirstamp)
-src/data/$(am__dirstamp):
+	./src/gui/symbol/$(am__dirstamp) \
+	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/editor.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
+	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/part_list.$(OBJEXT):  \
+	./src/gui/symbol/$(am__dirstamp) \
+	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/window.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
+	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/update_checker.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/new_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/icon_menu.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/util.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/data/$(am__dirstamp):
 	@$(mkdir_p) ./src/data
-	@: > src/data/$(am__dirstamp)
-src/data/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/data/$(am__dirstamp)
+./src/data/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/$(DEPDIR)
-	@: > src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/field.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-src/data/field/$(am__dirstamp):
+	@: > ./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/field.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/field
-	@: > src/data/field/$(am__dirstamp)
-src/data/field/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/data/field/$(am__dirstamp)
+./src/data/field/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/field/$(DEPDIR)
-	@: > src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/color.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/symbol.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	src/data/field/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/color.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/symbol.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+	./src/data/field/$(DEPDIR)/$(am__dirstamp)
 ./src/data/field/multiple_choice.$(OBJEXT):  \
-	src/data/field/$(am__dirstamp) \
-	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/choice.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/boolean.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/text.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/image.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/symbol.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/stylesheet.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/set.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/font.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/locale.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/symbol_font.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-src/data/action/$(am__dirstamp):
+	./src/data/field/$(am__dirstamp) \
+	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/choice.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/boolean.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/text.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/image.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/symbol.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/stylesheet.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/set.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/font.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/locale.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/symbol_font.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/action
-	@: > src/data/action/$(am__dirstamp)
-src/data/action/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/data/action/$(am__dirstamp)
+./src/data/action/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/action/$(DEPDIR)
-	@: > src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/symbol.$(OBJEXT): src/data/action/$(am__dirstamp) \
-	src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/set.$(OBJEXT): src/data/action/$(am__dirstamp) \
-	src/data/action/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/symbol.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
+	./src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/set.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
+	./src/data/action/$(DEPDIR)/$(am__dirstamp)
 ./src/data/action/symbol_part.$(OBJEXT):  \
-	src/data/action/$(am__dirstamp) \
-	src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/value.$(OBJEXT): src/data/action/$(am__dirstamp) \
-	src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/card.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-src/data/format/$(am__dirstamp):
+	./src/data/action/$(am__dirstamp) \
+	./src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/value.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
+	./src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/card.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/format
-	@: > src/data/format/$(am__dirstamp)
-src/data/format/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/data/format/$(am__dirstamp)
+./src/data/format/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/format/$(DEPDIR)
-	@: > src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/html.$(OBJEXT): src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/html.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/apprentice.$(OBJEXT):  \
-	src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
+	./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/mtg_editor.$(OBJEXT):  \
-	src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/formats.$(OBJEXT): src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/image.$(OBJEXT): src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/mws.$(OBJEXT): src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/mse1.$(OBJEXT): src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/mse2.$(OBJEXT): src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
+	./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/formats.$(OBJEXT):  \
+	./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/image.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mws.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mse1.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mse2.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/clipboard.$(OBJEXT):  \
-	src/data/format/$(am__dirstamp) \
-	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/statistics.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/settings.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/keyword.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/game.$(OBJEXT): src/data/$(am__dirstamp) \
-	src/data/$(DEPDIR)/$(am__dirstamp)
-src/util/io/$(am__dirstamp):
+	./src/data/format/$(am__dirstamp) \
+	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/statistics.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/settings.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/keyword.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/game.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	./src/data/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/io
-	@: > src/util/io/$(am__dirstamp)
-src/util/io/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/util/io/$(am__dirstamp)
+./src/util/io/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/io/$(DEPDIR)
-	@: > src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/package.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/writer.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/get_member.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/reader.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/package_manager.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	src/util/io/$(DEPDIR)/$(am__dirstamp)
-src/util/$(am__dirstamp):
+	@: > ./src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/package.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/writer.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/get_member.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/reader.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/package_manager.$(OBJEXT):  \
+	./src/util/io/$(am__dirstamp) \
+	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/$(am__dirstamp):
 	@$(mkdir_p) ./src/util
-	@: > src/util/$(am__dirstamp)
-src/util/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/util/$(am__dirstamp)
+./src/util/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/$(DEPDIR)
-	@: > src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/rotation.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/action_stack.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/alignment.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/version.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/string.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/tagged_string.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/age.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/error.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
-src/$(am__dirstamp):
+	@: > ./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/rotation.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/action_stack.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/alignment.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/version.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/string.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/tagged_string.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/age.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/error.$(OBJEXT): ./src/util/$(am__dirstamp) \
+	./src/util/$(DEPDIR)/$(am__dirstamp)
+./src/$(am__dirstamp):
 	@$(mkdir_p) ./src
-	@: > src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/$(am__dirstamp)
+./src/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/$(DEPDIR)
-	@: > src/$(DEPDIR)/$(am__dirstamp)
-./src/main.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-./src/code_template.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/render/card/$(am__dirstamp):
+	@: > ./src/$(DEPDIR)/$(am__dirstamp)
+./src/main.$(OBJEXT): ./src/$(am__dirstamp) \
+	./src/$(DEPDIR)/$(am__dirstamp)
+./src/code_template.$(OBJEXT): ./src/$(am__dirstamp) \
+	./src/$(DEPDIR)/$(am__dirstamp)
+./src/render/card/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/card
-	@: > src/render/card/$(am__dirstamp)
-src/render/card/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/render/card/$(am__dirstamp)
+./src/render/card/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/card/$(DEPDIR)
-	@: > src/render/card/$(DEPDIR)/$(am__dirstamp)
-./src/render/card/viewer.$(OBJEXT): src/render/card/$(am__dirstamp) \
-	src/render/card/$(DEPDIR)/$(am__dirstamp)
-src/render/text/$(am__dirstamp):
+	@: > ./src/render/card/$(DEPDIR)/$(am__dirstamp)
+./src/render/card/viewer.$(OBJEXT): ./src/render/card/$(am__dirstamp) \
+	./src/render/card/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/text
-	@: > src/render/text/$(am__dirstamp)
-src/render/text/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/render/text/$(am__dirstamp)
+./src/render/text/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/text/$(DEPDIR)
-	@: > src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/symbol.$(OBJEXT): src/render/text/$(am__dirstamp) \
-	src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/font.$(OBJEXT): src/render/text/$(am__dirstamp) \
-	src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/compound.$(OBJEXT): src/render/text/$(am__dirstamp) \
-	src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/viewer.$(OBJEXT): src/render/text/$(am__dirstamp) \
-	src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/element.$(OBJEXT): src/render/text/$(am__dirstamp) \
-	src/render/text/$(DEPDIR)/$(am__dirstamp)
-src/render/value/$(am__dirstamp):
+	@: > ./src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/symbol.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
+	./src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/font.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
+	./src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/compound.$(OBJEXT):  \
+	./src/render/text/$(am__dirstamp) \
+	./src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/viewer.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
+	./src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/element.$(OBJEXT):  \
+	./src/render/text/$(am__dirstamp) \
+	./src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/value
-	@: > src/render/value/$(am__dirstamp)
-src/render/value/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/render/value/$(am__dirstamp)
+./src/render/value/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/value/$(DEPDIR)
-	@: > src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/color.$(OBJEXT): src/render/value/$(am__dirstamp) \
-	src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/symbol.$(OBJEXT): src/render/value/$(am__dirstamp) \
-	src/render/value/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/color.$(OBJEXT):  \
+	./src/render/value/$(am__dirstamp) \
+	./src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/symbol.$(OBJEXT):  \
+	./src/render/value/$(am__dirstamp) \
+	./src/render/value/$(DEPDIR)/$(am__dirstamp)
 ./src/render/value/multiple_choice.$(OBJEXT):  \
-	src/render/value/$(am__dirstamp) \
-	src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/choice.$(OBJEXT): src/render/value/$(am__dirstamp) \
-	src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/text.$(OBJEXT): src/render/value/$(am__dirstamp) \
-	src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/image.$(OBJEXT): src/render/value/$(am__dirstamp) \
-	src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/viewer.$(OBJEXT): src/render/value/$(am__dirstamp) \
-	src/render/value/$(DEPDIR)/$(am__dirstamp)
-src/render/symbol/$(am__dirstamp):
+	./src/render/value/$(am__dirstamp) \
+	./src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/choice.$(OBJEXT):  \
+	./src/render/value/$(am__dirstamp) \
+	./src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/text.$(OBJEXT): ./src/render/value/$(am__dirstamp) \
+	./src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/image.$(OBJEXT):  \
+	./src/render/value/$(am__dirstamp) \
+	./src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/viewer.$(OBJEXT):  \
+	./src/render/value/$(am__dirstamp) \
+	./src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/symbol/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/symbol
-	@: > src/render/symbol/$(am__dirstamp)
-src/render/symbol/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/render/symbol/$(am__dirstamp)
+./src/render/symbol/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/symbol/$(DEPDIR)
-	@: > src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/render/symbol/filter.$(OBJEXT):  \
-	src/render/symbol/$(am__dirstamp) \
-	src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+	./src/render/symbol/$(am__dirstamp) \
+	./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/render/symbol/viewer.$(OBJEXT):  \
-	src/render/symbol/$(am__dirstamp) \
-	src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-src/script/$(am__dirstamp):
+	./src/render/symbol/$(am__dirstamp) \
+	./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/script/$(am__dirstamp):
 	@$(mkdir_p) ./src/script
-	@: > src/script/$(am__dirstamp)
-src/script/$(DEPDIR)/$(am__dirstamp):
+	@: > ./src/script/$(am__dirstamp)
+./src/script/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/script/$(DEPDIR)
-	@: > src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/parser.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/functions.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/image.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/dependency.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/value.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/script.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/context.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/script_manager.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/scriptable.$(OBJEXT): src/script/$(am__dirstamp) \
-	src/script/$(DEPDIR)/$(am__dirstamp)
+	@: > ./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/parser.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/functions.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/image.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/dependency.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/value.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/script.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/context.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/script_manager.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/scriptable.$(OBJEXT): ./src/script/$(am__dirstamp) \
+	./src/script/$(DEPDIR)/$(am__dirstamp)
 magicseteditor$(EXEEXT): $(magicseteditor_OBJECTS) $(magicseteditor_DEPENDENCIES) 
 	@rm -f magicseteditor$(EXEEXT)
 	$(CXXLINK) $(magicseteditor_LDFLAGS) $(magicseteditor_OBJECTS) $(magicseteditor_LDADD) $(LIBS)
@@ -1305,42 +1310,42 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f src/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/$(am__dirstamp)
-	-rm -f src/data/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/data/$(am__dirstamp)
-	-rm -f src/data/action/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/data/action/$(am__dirstamp)
-	-rm -f src/data/field/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/data/field/$(am__dirstamp)
-	-rm -f src/data/format/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/data/format/$(am__dirstamp)
-	-rm -f src/gfx/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/gfx/$(am__dirstamp)
-	-rm -f src/gui/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/gui/$(am__dirstamp)
-	-rm -f src/gui/control/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/gui/control/$(am__dirstamp)
-	-rm -f src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/gui/set/$(am__dirstamp)
-	-rm -f src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/gui/symbol/$(am__dirstamp)
-	-rm -f src/gui/value/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/gui/value/$(am__dirstamp)
-	-rm -f src/render/card/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/render/card/$(am__dirstamp)
-	-rm -f src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/render/symbol/$(am__dirstamp)
-	-rm -f src/render/text/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/render/text/$(am__dirstamp)
-	-rm -f src/render/value/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/render/value/$(am__dirstamp)
-	-rm -f src/script/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/script/$(am__dirstamp)
-	-rm -f src/util/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/util/$(am__dirstamp)
-	-rm -f src/util/io/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/util/io/$(am__dirstamp)
+	-rm -f ./src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/$(am__dirstamp)
+	-rm -f ./src/data/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/data/$(am__dirstamp)
+	-rm -f ./src/data/action/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/data/action/$(am__dirstamp)
+	-rm -f ./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/data/field/$(am__dirstamp)
+	-rm -f ./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/data/format/$(am__dirstamp)
+	-rm -f ./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/gfx/$(am__dirstamp)
+	-rm -f ./src/gui/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/gui/$(am__dirstamp)
+	-rm -f ./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/gui/control/$(am__dirstamp)
+	-rm -f ./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/gui/set/$(am__dirstamp)
+	-rm -f ./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/gui/symbol/$(am__dirstamp)
+	-rm -f ./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/gui/value/$(am__dirstamp)
+	-rm -f ./src/render/card/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/render/card/$(am__dirstamp)
+	-rm -f ./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/render/symbol/$(am__dirstamp)
+	-rm -f ./src/render/text/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/render/text/$(am__dirstamp)
+	-rm -f ./src/render/value/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/render/value/$(am__dirstamp)
+	-rm -f ./src/script/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/script/$(am__dirstamp)
+	-rm -f ./src/util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/util/$(am__dirstamp)
+	-rm -f ./src/util/io/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ./src/util/io/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"

src/data/action/symbol.cpp

@@ -77,8 +77,8 @@ void SymbolPartMatrixAction::transform(const Vector2D& mx, const Vector2D& my) {
 
 SymbolPartRotateAction::SymbolPartRotateAction(const set<SymbolPartP>& parts, const Vector2D& center)
 	: SymbolPartMatrixAction(parts, center)
-	, constrain(false)
 	, angle(0)
+	, constrain(false)
 {}
 
 String SymbolPartRotateAction::getName(bool to_undo) const {
@@ -154,8 +154,8 @@ void SymbolPartShearAction::shearBy(const Vector2D& shear) {
 
 SymbolPartScaleAction::SymbolPartScaleAction(const set<SymbolPartP>& parts, int scaleX, int scaleY)
 	: parts(parts)
-	, constrain(false)
 	, scaleX(scaleX), scaleY(scaleY)
+	, constrain(false)
 {
 	// Find min and max coordinates
 	oldMin          =  Vector2D::infinity();

src/data/action/symbol_part.cpp

@@ -76,9 +76,9 @@ void ControlPointMoveAction::move (const Vector2D& deltaDelta) {
 
 HandleMoveAction::HandleMoveAction(const SelectedHandle& handle)
 	: handle(handle)
-	, constrain(false)
 	, old_handle(handle.getHandle())
 	, old_other (handle.getOther())
+	, constrain(false)
 {}
 
 String HandleMoveAction::getName(bool to_undo) const {
@@ -196,11 +196,11 @@ void CurveDragAction::move(const Vector2D& delta, double t) {
 // ----------------------------------------------------------------------------- : Add control point
 
 ControlPointAddAction::ControlPointAddAction(const SymbolPartP& part, UInt insert_after, double t)
-	: point1(part->getPoint(insert_after))
-	, point2(part->getPoint(insert_after + 1))
-	, part(part)
-	, insert_after(insert_after)
+	: part(part)
 	, new_point(new ControlPoint())
+	, insert_after(insert_after)
+	, point1(part->getPoint(insert_after))
+	, point2(part->getPoint(insert_after + 1))
 {
 	// calculate new point
 	if (point1.other.segment_after == SEGMENT_CURVE) {

src/data/action/value.cpp

@@ -19,7 +19,7 @@
 // ----------------------------------------------------------------------------- : ValueAction
 
 String ValueAction::getName(bool to_undo) const {
-	return String::Format(_ACTION_("change"), valueP->fieldP->name);
+	return format_string(_ACTION_("change"), valueP->fieldP->name);
 }
 
 // ----------------------------------------------------------------------------- : Simple
@@ -61,8 +61,10 @@ ValueAction* value_action(const SymbolValueP& value, const FileName&
 // ----------------------------------------------------------------------------- : Text
 
 TextValueAction::TextValueAction(const TextValueP& value, size_t start, size_t end, size_t new_end, const Defaultable<String>& new_value, const String& name)
-	: ValueAction(value), new_value(new_value), name(name)
+	: ValueAction(value)
 	, selection_start(start), selection_end(end), new_selection_end(new_end)
+	, new_value(new_value)
+	, name(name)
 {}
 
 String TextValueAction::getName(bool to_undo) const { return name; }

src/data/field.cpp

@@ -26,8 +26,8 @@ Field::Field()
 	, identifying      (false)
 	, card_list_column (100)
 	, card_list_width  (100)
-	, card_list_allow  (true)
 	, card_list_visible(false)
+	, card_list_allow  (true)
 	, card_list_align  (ALIGN_LEFT)
 	, tab_index        (0)
 {}
@@ -79,8 +79,8 @@ shared_ptr<Field> read_new<Field>(Reader& reader) {
 Style::Style(const FieldP& field)
 	: fieldP(field)
 	, z_index(0)
-	, left(0), width (0)
-	, top (0), height(0)
+	, left(0),  top(0)
+	, width(0), height(0)
 	, visible(true)
 {}
 

src/data/field/color.cpp

@@ -14,8 +14,8 @@ DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
 // ----------------------------------------------------------------------------- : ColorField
 
 ColorField::ColorField()
-	: default_name(_("Default"))
-	, allow_custom(true)
+	: allow_custom(true)
+	, default_name(_("Default"))
 {}
 
 IMPLEMENT_FIELD_TYPE(Color)

src/data/statistics.cpp

@@ -52,8 +52,8 @@ StatsCategory::StatsCategory(const StatsDimensionP& dim)
 	, name         (dim->name)
 	, description  (dim->description)
 	, icon_filename(dim->icon_filename)
-	, type(GRAPH_TYPE_BAR)
 	, dimensions(1, dim)
+	, type(GRAPH_TYPE_BAR)
 {}
 
 IMPLEMENT_REFLECTION_ENUM(GraphType) {

src/gui/util.cpp

@@ -114,7 +114,7 @@ wxIcon load_resource_icon(const String& name) {
 	#if defined(__WXMSW__)
 		return wxIcon(_("icon/") + name);
 	#else
-		return wxIcon(load_resource_image(_("icon/") + name));
+		return wxIcon(_("icon/") + name + _(".ico"), wxBITMAP_TYPE_ICO);
 	#endif
 }
 

src/main.cpp

@@ -41,7 +41,12 @@ IMPLEMENT_APP(MSE)
 
 bool MSE::OnInit() {
 	try {
-		SetAppName(_("Magic Set Editor"));
+		#ifdef __WXMSW__
+			SetAppName(_("Magic Set Editor"));
+		#else
+			// Platform friendly appname
+			SetAppName(_("magicseteditor"));
+		#endif
 		wxInitAllImageHandlers();
 		wxFileSystem::AddHandler(new wxInternetFSHandler); // needed for update checker
 		init_file_formats();

src/script/script_manager.hpp

@@ -28,7 +28,7 @@ DECLARE_POINTER_TYPE(Card);
 class SetScriptContext {
   public:
 	SetScriptContext(Set& set);
-	~SetScriptContext();
+	virtual ~SetScriptContext();
 	
 	/// Get a context to use for the set, for a given stylesheet
 	Context& getContext(const StyleSheetP&);

src/util/io/package.cpp

@@ -22,8 +22,8 @@ IMPLEMENT_DYNAMIC_ARG(Package*, writing_package,   nullptr);
 IMPLEMENT_DYNAMIC_ARG(Package*, clipboard_package, nullptr);
 
 Package::Package()
-	: zipStream (nullptr)
-	, fileStream(nullptr)
+	: fileStream(nullptr)
+	, zipStream (nullptr)
 {}
 
 Package::~Package() {
@@ -446,4 +446,4 @@ void Packaged::saveAs(const String& package) {
 void Packaged::validate(Version) {
 	// a default for the short name
 	if (short_name.empty()) short_name = name();
-}
+}

src/util/io/reader.cpp

@@ -14,19 +14,18 @@
 // ----------------------------------------------------------------------------- : Reader
 
 Reader::Reader(const InputStreamP& input, const String& filename)
-	: input(input), filename(filename), line_number(0)
-	, indent(0), expected_indent(0), just_opened(false)
-	, stream(*input)
+	: indent(0), expected_indent(0), just_opened(false)
+	, filename(filename), line_number(0)
+	, input(input), stream(*input)
 {
 	moveNext();
 	handleAppVersion();
 }
 
 Reader::Reader(const String& filename)
-	: input(packages.openFileFromPackage(filename))
+	: indent(0), expected_indent(0), just_opened(false)
 	, filename(filename), line_number(0)
-	, indent(0), expected_indent(0), just_opened(false)
-	, stream(*input)
+	, input(packages.openFileFromPackage(filename)), stream(*input)
 {
 	moveNext();
 	handleAppVersion();

src/util/io/writer.cpp

@@ -15,10 +15,8 @@
 // ----------------------------------------------------------------------------- : Writer
 
 Writer::Writer(const OutputStreamP& output)
-	: output(output)
-	, stream(*output)
-	, indentation(0)
-	, just_opened(false)
+	: indentation(0), just_opened(false)
+	, output(output), stream(*output)
 {
 	stream.WriteString(BYTE_ORDER_MARK);
 	handleAppVersion();
@@ -132,4 +130,4 @@ template <> void Writer::handle(const FileName& value) {
 			writing_package()->referenceFile(value);
 		}
 	}
-}
+}

src/util/platform.hpp

@@ -4,8 +4,8 @@
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
-#ifndef HEADER_UTIL_PREC
-#define HEADER_UTIL_PREC
+#ifndef HEADER_UTIL_PLATFORM
+#define HEADER_UTIL_PLATFORM
 
 /** @file util/platform.hpp
  *
@@ -23,7 +23,7 @@
 
 #ifdef __linux__
 	
-	inline void wxMkDir(const String& str) {
+	inline void wxMkDir(const String& dir) {
 		wxMkDir(wxConvLocal.cWX2MB(dir), 0777);
 	}