diff --git a/Resources.sh b/Resources.sh deleted file mode 100755 index f412e5bf..00000000 --- a/Resources.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/bash - -BASEDIR=~/.magicseteditor/resource - -rm -rf $BASEDIR - -for DIR in $BASEDIR $BASEDIR/icon $BASEDIR/tool $BASEDIR/cursor -do -if [ -d $DIR ]; then -: ; -elif [ -a $DIR ]; then -echo $DIR "exists and is not a directory!"; -exit 1 ; -else -mkdir $DIR; -fi -done - -cp src/resource/common/* $BASEDIR; -cp src/resource/msw/tool/* $BASEDIR/tool; -cp src/resource/msw/icon/* $BASEDIR/icon; -cp src/resource/msw/cursor/* $BASEDIR/cursor; -cp src/resource/msw/other/* $BASEDIR; diff --git a/src/data/font.cpp b/src/data/font.cpp index 5ff49c97..8a23b308 100644 --- a/src/data/font.cpp +++ b/src/data/font.cpp @@ -98,12 +98,10 @@ wxFont Font::toWxFont(double scale) const { font = wxFont(size_i, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, weight_i, underline(), italic_name()); } else { String familyName = name(); - if(familyName.EndsWith(BOLD_STRING)) { familyName = familyName.Left(familyName.length() - BOLD_STRING.length()); weight_i = wxFONTWEIGHT_BOLD; } - font = wxFont(size_i, wxFONTFAMILY_DEFAULT, style_i, weight_i, underline(), familyName); } // fix size