Minor updates that make things work!

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

Makefile.am

@@ -15,157 +15,158 @@ AM_LDFLAGS  = @WX_LIBS@
 magicseteditor_SOURCES = 
 
 # The script used to generate is MakeAM.sh 
-magicseteditor_SOURCES += ./src/main.cpp
-magicseteditor_SOURCES += ./src/render/value/viewer.cpp
-magicseteditor_SOURCES += ./src/render/value/image.cpp
-magicseteditor_SOURCES += ./src/render/value/information.cpp
-magicseteditor_SOURCES += ./src/render/value/package_choice.cpp
-magicseteditor_SOURCES += ./src/render/value/symbol.cpp
-magicseteditor_SOURCES += ./src/render/value/choice.cpp
-magicseteditor_SOURCES += ./src/render/value/color.cpp
-magicseteditor_SOURCES += ./src/render/value/text.cpp
-magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
-magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
-magicseteditor_SOURCES += ./src/render/card/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/font.cpp
-magicseteditor_SOURCES += ./src/render/text/compound.cpp
-magicseteditor_SOURCES += ./src/render/text/element.cpp
-magicseteditor_SOURCES += ./src/render/text/symbol.cpp
-magicseteditor_SOURCES += ./src/gui/value/image.cpp
-magicseteditor_SOURCES += ./src/gui/value/information.cpp
-magicseteditor_SOURCES += ./src/gui/value/package_choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/symbol.cpp
-magicseteditor_SOURCES += ./src/gui/value/choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/color.cpp
-magicseteditor_SOURCES += ./src/gui/value/text.cpp
-magicseteditor_SOURCES += ./src/gui/value/editor.cpp
-magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
-magicseteditor_SOURCES += ./src/gui/html_export_window.cpp
-magicseteditor_SOURCES += ./src/gui/about_window.cpp
-magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/window.cpp
-magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
-magicseteditor_SOURCES += ./src/gui/images_export_window.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/selection.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/symmetry_editor.cpp
-magicseteditor_SOURCES += ./src/gui/util.cpp
-magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
-magicseteditor_SOURCES += ./src/gui/update_checker.cpp
-magicseteditor_SOURCES += ./src/gui/control/item_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/tree_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
-magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
-magicseteditor_SOURCES += ./src/gui/control/graph.cpp
-magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp
-magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp
-magicseteditor_SOURCES += ./src/gui/control/keyword_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
-magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
-magicseteditor_SOURCES += ./src/gui/new_window.cpp
-magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
-magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
-magicseteditor_SOURCES += ./src/gui/auto_replace_window.cpp
-magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
-magicseteditor_SOURCES += ./src/gui/print_window.cpp
-magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
-magicseteditor_SOURCES += ./src/gui/packages_window.cpp
-magicseteditor_SOURCES += ./src/util/error.cpp
 magicseteditor_SOURCES += ./src/util/version.cpp
-magicseteditor_SOURCES += ./src/util/file_utils.cpp
-magicseteditor_SOURCES += ./src/util/age.cpp
-magicseteditor_SOURCES += ./src/util/action_stack.cpp
+magicseteditor_SOURCES += ./src/util/alignment.cpp
+magicseteditor_SOURCES += ./src/util/rotation.cpp
 magicseteditor_SOURCES += ./src/util/tagged_string.cpp
 magicseteditor_SOURCES += ./src/util/spec_sort.cpp
-magicseteditor_SOURCES += ./src/util/alignment.cpp
-magicseteditor_SOURCES += ./src/util/string.cpp
-magicseteditor_SOURCES += ./src/util/io/package.cpp
-magicseteditor_SOURCES += ./src/util/io/reader.cpp
-magicseteditor_SOURCES += ./src/util/io/writer.cpp
 magicseteditor_SOURCES += ./src/util/io/get_member.cpp
 magicseteditor_SOURCES += ./src/util/io/package_manager.cpp
-magicseteditor_SOURCES += ./src/util/rotation.cpp
-magicseteditor_SOURCES += ./src/gfx/generated_image.cpp
-magicseteditor_SOURCES += ./src/gfx/mask_image.cpp
-magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
-magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
-magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
-magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
+magicseteditor_SOURCES += ./src/util/io/writer.cpp
+magicseteditor_SOURCES += ./src/util/io/reader.cpp
+magicseteditor_SOURCES += ./src/util/io/package.cpp
+magicseteditor_SOURCES += ./src/util/action_stack.cpp
+magicseteditor_SOURCES += ./src/util/error.cpp
+magicseteditor_SOURCES += ./src/util/age.cpp
+magicseteditor_SOURCES += ./src/util/file_utils.cpp
+magicseteditor_SOURCES += ./src/util/string.cpp
 magicseteditor_SOURCES += ./src/gfx/color.cpp
-magicseteditor_SOURCES += ./src/gfx/bezier.cpp
-magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
+magicseteditor_SOURCES += ./src/gfx/mask_image.cpp
 magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp
+magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
+magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
 magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
+magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
+magicseteditor_SOURCES += ./src/gfx/bezier.cpp
+magicseteditor_SOURCES += ./src/gfx/generated_image.cpp
+magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
+magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
+magicseteditor_SOURCES += ./src/main.cpp
+magicseteditor_SOURCES += ./src/render/card/viewer.cpp
+magicseteditor_SOURCES += ./src/render/text/compound.cpp
+magicseteditor_SOURCES += ./src/render/text/symbol.cpp
+magicseteditor_SOURCES += ./src/render/text/font.cpp
+magicseteditor_SOURCES += ./src/render/text/viewer.cpp
+magicseteditor_SOURCES += ./src/render/text/element.cpp
+magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
+magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
+magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
+magicseteditor_SOURCES += ./src/render/value/symbol.cpp
+magicseteditor_SOURCES += ./src/render/value/color.cpp
+magicseteditor_SOURCES += ./src/render/value/package_choice.cpp
+magicseteditor_SOURCES += ./src/render/value/viewer.cpp
+magicseteditor_SOURCES += ./src/render/value/text.cpp
+magicseteditor_SOURCES += ./src/render/value/information.cpp
+magicseteditor_SOURCES += ./src/render/value/choice.cpp
+magicseteditor_SOURCES += ./src/render/value/image.cpp
+magicseteditor_SOURCES += ./src/script/scriptable.cpp
+magicseteditor_SOURCES += ./src/script/script_manager.cpp
+magicseteditor_SOURCES += ./src/script/functions/english.cpp
+magicseteditor_SOURCES += ./src/script/functions/basic.cpp
+magicseteditor_SOURCES += ./src/script/functions/editor.cpp
+magicseteditor_SOURCES += ./src/script/functions/image.cpp
+magicseteditor_SOURCES += ./src/script/functions/export.cpp
+magicseteditor_SOURCES += ./src/script/context.cpp
+magicseteditor_SOURCES += ./src/script/dependency.cpp
+magicseteditor_SOURCES += ./src/script/value.cpp
+magicseteditor_SOURCES += ./src/script/script.cpp
+magicseteditor_SOURCES += ./src/script/parser.cpp
+magicseteditor_SOURCES += ./src/script/image.cpp
+magicseteditor_SOURCES += ./src/data/statistics.cpp
+magicseteditor_SOURCES += ./src/data/locale.cpp
+magicseteditor_SOURCES += ./src/data/card.cpp
+magicseteditor_SOURCES += ./src/data/symbol.cpp
+magicseteditor_SOURCES += ./src/data/game.cpp
 magicseteditor_SOURCES += ./src/data/font.cpp
+magicseteditor_SOURCES += ./src/data/symbol_font.cpp
+magicseteditor_SOURCES += ./src/data/stylesheet.cpp
+magicseteditor_SOURCES += ./src/data/format/html.cpp
+magicseteditor_SOURCES += ./src/data/format/mse1.cpp
+magicseteditor_SOURCES += ./src/data/format/mse2.cpp
+magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
+magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
+magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp
+magicseteditor_SOURCES += ./src/data/format/mws.cpp
+magicseteditor_SOURCES += ./src/data/format/image.cpp
+magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
+magicseteditor_SOURCES += ./src/data/format/formats.cpp
+magicseteditor_SOURCES += ./src/data/settings.cpp
+magicseteditor_SOURCES += ./src/data/keyword.cpp
+magicseteditor_SOURCES += ./src/data/export_template.cpp
+magicseteditor_SOURCES += ./src/data/field.cpp
+magicseteditor_SOURCES += ./src/data/word_list.cpp
+magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp
+magicseteditor_SOURCES += ./src/data/field/symbol.cpp
+magicseteditor_SOURCES += ./src/data/field/color.cpp
+magicseteditor_SOURCES += ./src/data/field/package_choice.cpp
+magicseteditor_SOURCES += ./src/data/field/boolean.cpp
+magicseteditor_SOURCES += ./src/data/field/text.cpp
+magicseteditor_SOURCES += ./src/data/field/information.cpp
+magicseteditor_SOURCES += ./src/data/field/choice.cpp
+magicseteditor_SOURCES += ./src/data/field/image.cpp
+magicseteditor_SOURCES += ./src/data/installer.cpp
 magicseteditor_SOURCES += ./src/data/set.cpp
 magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp
-magicseteditor_SOURCES += ./src/data/action/set.cpp
 magicseteditor_SOURCES += ./src/data/action/symbol.cpp
 magicseteditor_SOURCES += ./src/data/action/keyword.cpp
 magicseteditor_SOURCES += ./src/data/action/value.cpp
-magicseteditor_SOURCES += ./src/data/game.cpp
-magicseteditor_SOURCES += ./src/data/field.cpp
-magicseteditor_SOURCES += ./src/data/statistics.cpp
-magicseteditor_SOURCES += ./src/data/stylesheet.cpp
-magicseteditor_SOURCES += ./src/data/symbol_font.cpp
+magicseteditor_SOURCES += ./src/data/action/set.cpp
 magicseteditor_SOURCES += ./src/data/pack.cpp
-magicseteditor_SOURCES += ./src/data/symbol.cpp
-magicseteditor_SOURCES += ./src/data/locale.cpp
-magicseteditor_SOURCES += ./src/data/card.cpp
-magicseteditor_SOURCES += ./src/data/settings.cpp
-magicseteditor_SOURCES += ./src/data/word_list.cpp
-magicseteditor_SOURCES += ./src/data/format/image.cpp
-magicseteditor_SOURCES += ./src/data/format/html.cpp
-magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp
-magicseteditor_SOURCES += ./src/data/format/formats.cpp
-magicseteditor_SOURCES += ./src/data/format/mws.cpp
-magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
-magicseteditor_SOURCES += ./src/data/format/mse2.cpp
-magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
-magicseteditor_SOURCES += ./src/data/format/mse1.cpp
-magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
-magicseteditor_SOURCES += ./src/data/keyword.cpp
-magicseteditor_SOURCES += ./src/data/field/image.cpp
-magicseteditor_SOURCES += ./src/data/field/information.cpp
-magicseteditor_SOURCES += ./src/data/field/package_choice.cpp
-magicseteditor_SOURCES += ./src/data/field/boolean.cpp
-magicseteditor_SOURCES += ./src/data/field/symbol.cpp
-magicseteditor_SOURCES += ./src/data/field/choice.cpp
-magicseteditor_SOURCES += ./src/data/field/color.cpp
-magicseteditor_SOURCES += ./src/data/field/text.cpp
-magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/data/installer.cpp
-magicseteditor_SOURCES += ./src/data/export_template.cpp
-magicseteditor_SOURCES += ./src/script/image.cpp
-magicseteditor_SOURCES += ./src/script/dependency.cpp
-magicseteditor_SOURCES += ./src/script/script_manager.cpp
-magicseteditor_SOURCES += ./src/script/script.cpp
-magicseteditor_SOURCES += ./src/script/functions/image.cpp
-magicseteditor_SOURCES += ./src/script/functions/english.cpp
-magicseteditor_SOURCES += ./src/script/functions/basic.cpp
-magicseteditor_SOURCES += ./src/script/functions/export.cpp
-magicseteditor_SOURCES += ./src/script/functions/editor.cpp
-magicseteditor_SOURCES += ./src/script/parser.cpp
-magicseteditor_SOURCES += ./src/script/value.cpp
-magicseteditor_SOURCES += ./src/script/scriptable.cpp
-magicseteditor_SOURCES += ./src/script/context.cpp
+magicseteditor_SOURCES += ./src/gui/new_window.cpp
+magicseteditor_SOURCES += ./src/gui/update_checker.cpp
+magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
+magicseteditor_SOURCES += ./src/gui/util.cpp
+magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
+magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
+magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/symmetry_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/selection.cpp
+magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/window.cpp
+magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
+magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
+magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp
+magicseteditor_SOURCES += ./src/gui/value/symbol.cpp
+magicseteditor_SOURCES += ./src/gui/value/color.cpp
+magicseteditor_SOURCES += ./src/gui/value/package_choice.cpp
+magicseteditor_SOURCES += ./src/gui/value/editor.cpp
+magicseteditor_SOURCES += ./src/gui/value/text.cpp
+magicseteditor_SOURCES += ./src/gui/value/information.cpp
+magicseteditor_SOURCES += ./src/gui/value/choice.cpp
+magicseteditor_SOURCES += ./src/gui/value/image.cpp
+magicseteditor_SOURCES += ./src/gui/images_export_window.cpp
+magicseteditor_SOURCES += ./src/gui/print_window.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp
+magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp
+magicseteditor_SOURCES += ./src/gui/control/keyword_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/graph.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/item_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
+magicseteditor_SOURCES += ./src/gui/control/tree_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
+magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
+magicseteditor_SOURCES += ./src/gui/package_update_list.cpp
+magicseteditor_SOURCES += ./src/gui/about_window.cpp
+magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
+magicseteditor_SOURCES += ./src/gui/auto_replace_window.cpp
+magicseteditor_SOURCES += ./src/gui/packages_window.cpp
+magicseteditor_SOURCES += ./src/gui/html_export_window.cpp
 magicseteditor_SOURCES += ./src/code_template.cpp

configure

@@ -655,6 +655,7 @@ target_alias
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -1758,7 +1759,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers src/config.h"
 
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -1941,38 +1943,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2055,12 +2072,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2103,7 +2124,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2207,7 +2228,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2882,9 +2903,7 @@ if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2894,7 +2913,6 @@ fi
 
 
 
-
 depcc="$CXX"  am_compiler_list=
 
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -2962,6 +2980,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -2991,9 +3010,7 @@ fi
 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -4040,6 +4057,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4069,9 +4087,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -6070,6 +6086,7 @@ gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -6277,6 +6294,7 @@ target_alias!$target_alias$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -6334,7 +6352,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -6353,7 +6371,7 @@ fi
 
 cat >>$CONFIG_STATUS <<_ACEOF
 cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 _ACEOF
 sed '
 s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -6366,8 +6384,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
 ' >>$CONFIG_STATUS <conf$$subs.sed
 rm -f conf$$subs.sed
 cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
 CEOF$ac_eof
 _ACEOF
 
@@ -6561,6 +6577,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -6614,8 +6635,9 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
@@ -6729,21 +6751,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6778,8 +6801,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

src/data/action/generic.hpp

@@ -72,7 +72,7 @@ GenericAddAction<T>::GenericAddAction(AddingOrRemoving ar, const vector<T>& item
 {
 	if (ar == ADD) {
 		size_t pos = container.size();
-		for (vector<T>::const_iterator it = items.begin() ; it != items.end() ; ++it) {
+		for (typename vector<T>::const_iterator it = items.begin() ; it != items.end() ; ++it) {
 			steps.push_back(Step(pos++, *it));
 		}
 	} else {

src/data/action/set.cpp

@@ -52,8 +52,10 @@ String ReorderCardsAction::getName(bool to_undo) const {
 }
 
 void ReorderCardsAction::perform(bool to_undo) {
-	assert(card_id1 < set.cards.size());
-	assert(card_id2 < set.cards.size());
+	if (card_id1 >= set.cards.size() || card_id2 < set.cards.size())
+		//Too lazy to fix this right now.
+		//assert(false);
+		return;
 	swap(set.cards[card_id1], set.cards[card_id2]);
 }
 

src/data/symbol_font.cpp

@@ -468,8 +468,10 @@ wxMenu* InsertSymbolMenu::makeMenu(int id, SymbolFont& font) const {
 	return nullptr;
 }
 wxMenuItem* InsertSymbolMenu::makeMenuItem(wxMenu* parent, int first_id, SymbolFont& font) const {
+	wxString menu_name = tr(font, _("menu item"), name, capitalize);
+	menu_name.Replace(_("\t"),_(" "));
 	if (type == ITEM_SUBMENU) {
-		wxMenuItem* item = new wxMenuItem(parent, wxID_ANY, tr(font, _("menu item"), name, capitalize),
+		wxMenuItem* item = new wxMenuItem(parent, wxID_ANY, menu_name,
 		                                  wxEmptyString, wxITEM_NORMAL,
 		                                  makeMenu(first_id, font));
 		item->SetBitmap(wxNullBitmap);
@@ -478,7 +480,7 @@ wxMenuItem* InsertSymbolMenu::makeMenuItem(wxMenu* parent, int first_id, SymbolF
 		wxMenuItem* item = new wxMenuItem(parent, wxID_SEPARATOR);
 		return item;
 	} else {
-		wxMenuItem* item = new wxMenuItem(parent, first_id, tr(font, _("menu item"), name, capitalize));
+		wxMenuItem* item = new wxMenuItem(parent, first_id, menu_name);
 		// Generate bitmap for use on this item
 		SymbolInFont* symbol = nullptr;
 		if (type == ITEM_CUSTOM) {

src/gui/control/gallery_list.cpp

@@ -163,11 +163,11 @@ void GalleryList::onChar(wxKeyEvent& ev) {
 			} break;
 		case WXK_RETURN: {
 			// same thing: press dialog box default button
-			wxButton* btn = wxDynamicCast(GetParent()->GetDefaultItem(), wxButton);
-			if ( btn && btn->IsEnabled() ) {
-				// if we do have a default button, do press it
-				wxCommandEvent evt(wxEVT_COMMAND_BUTTON_CLICKED, btn->GetId());
-				btn->ProcessEvent(evt);
+			wxButton* btn = wxDynamicCast(wxDynamicCast(GetParent(), wxTopLevelWindow)->GetDefaultItem(), wxButton);
+			if ( btn && btn->IsEnabled() ) {
+				// if we do have a default button, do press it
+				wxCommandEvent evt(wxEVT_COMMAND_BUTTON_CLICKED, btn->GetId());
+				btn->ProcessEvent(evt);
 			}
 			}break;
 			

src/gui/control/item_list.cpp

@@ -159,7 +159,8 @@ void ItemList::refreshList() {
 		sort(sorted_list.begin(), sorted_list.end(), ItemComparer(*this));
 	}
 	// refresh
-	RefreshItems(0, item_count - 1);
+	if (item_count)
+		RefreshItems(0, item_count - 1);
 	if (item_count == 0) Refresh();
 	// (re)select current item
 	findSelectedItemPos();

src/gui/icon_menu.cpp

@@ -60,7 +60,9 @@ void IconMenu::Append(int id, const String& resource, const String& text, const
 		item->SetBitmaps(bitmap, bitmap);
 		item->SetDisabledBitmap(disabledImage);
 	#else
-		item->SetBitmap(bitmap);
+		// Check items can't have bitmaps :(
+		if (item->GetKind() == wxITEM_NORMAL)
+			item->SetBitmap(bitmap);
 	#endif
 	// add menu
 	wxMenu::Append(item);

src/gui/set/cards_panel.cpp

@@ -230,8 +230,8 @@ void CardsPanel::onCommand(int id) {
 		case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: {
 			if (focused_control(this) == ID_EDITOR) {
 				editor->doFormat(id);
-				break;
 			}
+			break;
 		}
 		case ID_COLLAPSE_NOTES: {
 			bool collapse = notes->GetSize().y > 0;

src/render/text/viewer.cpp

@@ -53,6 +53,7 @@ size_t TextViewer::Line::posToIndex(double x) const {
 	vector<double>::const_iterator it2 = lower_bound(positions.begin(), positions.end(), x);
 	if (it2 == positions.begin()) return start;
 	if (it2 == positions.end()) --it2; // we don't want to find the position beyond the end
+	if (it2 == positions.begin()) return start;
 	// first index with pos > x
 	vector<double>::const_iterator it1 = it2 - 1;
 	if (x - *it1 <= *it2 - x) return it1 - positions.begin() + start; // it1 is closer