Skip to content

M
magicseteditor
Commit a80dc093 authored by coppro's avatar coppro
Browse files
Options

Fixed input. 

Update configure script to wxWidgets 2.8
Added required 2.8 includes.
parent e43fe3aa
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 28 deletions
MakeAM.sh
View file @ a80dc093
......@@ -15,6 +15,6 @@ AM_LDFLAGS = @WX_LIBS@
magicseteditor_SOURCES =
# The script used to generate is MakeAM. " | cat > Makefile.am;
# The script used to generate is MakeAM. " > Makefile.am;
find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./" | cat >> Makefile.am;
\ No newline at end of file
find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./" >> Makefile.am;
\ No newline at end of file
Makefile
View file @ a80dc093
......@@ -82,6 +82,7 @@ am_magicseteditor_OBJECTS = ./src/render/text/viewer.$(OBJEXT) \
./src/gfx/resample_image.$(OBJEXT) \
./src/gfx/resample_text.$(OBJEXT) \
./src/gfx/mask_image.$(OBJEXT) \
./src/gfx/generated_image.$(OBJEXT) \
./src/gui/control/select_card_list.$(OBJEXT) \
./src/gui/control/graph.$(OBJEXT) \
./src/gui/control/image_card_list.$(OBJEXT) \
......@@ -127,6 +128,7 @@ am_magicseteditor_OBJECTS = ./src/render/text/viewer.$(OBJEXT) \
./src/gui/print_window.$(OBJEXT) \
./src/gui/drop_down_list.$(OBJEXT) \
./src/gui/image_slice_window.$(OBJEXT) \
./src/gui/html_export_window.$(OBJEXT) \
./src/gui/images_export_window.$(OBJEXT) \
./src/script/script_manager.$(OBJEXT) \
./src/script/script.$(OBJEXT) \
......@@ -169,6 +171,7 @@ am_magicseteditor_OBJECTS = ./src/render/text/viewer.$(OBJEXT) \
./src/data/statistics.$(OBJEXT) ./src/data/set.$(OBJEXT) \
./src/data/symbol_font.$(OBJEXT) \
./src/data/export_template.$(OBJEXT) \
./src/data/installer.$(OBJEXT) ./src/data/pack.$(OBJEXT) \
./src/util/io/get_member.$(OBJEXT) \
./src/util/io/reader.$(OBJEXT) \
./src/util/io/package_manager.$(OBJEXT) \
......@@ -250,15 +253,15 @@ SET_MAKE =
SHELL = /bin/bash
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_ONLY =
WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
WX_CFLAGS_ONLY = -pthread
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_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_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__
WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
WX_CXXFLAGS_ONLY =
WX_LIBS = -pthread -lwx_gtk2u_aui-2.8 -lwx_gtk2u_xrc-2.8 -lwx_gtk2u_qa-2.8 -lwx_gtk2u_html-2.8 -lwx_gtk2u_adv-2.8 -lwx_gtk2u_core-2.8 -lwx_baseu_xml-2.8 -lwx_baseu_net-2.8 -lwx_baseu-2.8
WX_LIBS_STATIC =
WX_VERSION = 2.8.1
ac_ct_CC = gcc
ac_ct_CXX = g++
am__fastdepCC_FALSE = #
......@@ -300,8 +303,8 @@ 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_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
AM_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread -DUNICODE -I . -Wall
AM_LDFLAGS = -pthread -lwx_gtk2u_aui-2.8 -lwx_gtk2u_xrc-2.8 -lwx_gtk2u_qa-2.8 -lwx_gtk2u_html-2.8 -lwx_gtk2u_adv-2.8 -lwx_gtk2u_core-2.8 -lwx_baseu_xml-2.8 -lwx_baseu_net-2.8 -lwx_baseu-2.8
# The script used to generate is MakeAM.
magicseteditor_SOURCES = ./src/render/text/viewer.cpp \
......@@ -318,7 +321,7 @@ magicseteditor_SOURCES = ./src/render/text/viewer.cpp \
./src/gfx/combine_image.cpp ./src/gfx/image_effects.cpp \
./src/gfx/polynomial.cpp ./src/gfx/blend_image.cpp \
./src/gfx/resample_image.cpp ./src/gfx/resample_text.cpp \
./src/gfx/mask_image.cpp \
./src/gfx/mask_image.cpp ./src/gfx/generated_image.cpp \
./src/gui/control/select_card_list.cpp \
./src/gui/control/graph.cpp \
./src/gui/control/image_card_list.cpp \
......@@ -352,6 +355,7 @@ magicseteditor_SOURCES = ./src/render/text/viewer.cpp \
./src/gui/preferences_window.cpp ./src/gui/welcome_window.cpp \
./src/gui/print_window.cpp ./src/gui/drop_down_list.cpp \
./src/gui/image_slice_window.cpp \
./src/gui/html_export_window.cpp \
./src/gui/images_export_window.cpp \
./src/script/script_manager.cpp ./src/script/script.cpp \
./src/script/functions/basic.cpp \
......@@ -380,7 +384,8 @@ magicseteditor_SOURCES = ./src/render/text/viewer.cpp \
./src/data/field.cpp ./src/data/keyword.cpp \
./src/data/stylesheet.cpp ./src/data/statistics.cpp \
./src/data/set.cpp ./src/data/symbol_font.cpp \
./src/data/export_template.cpp ./src/util/io/get_member.cpp \
./src/data/export_template.cpp ./src/data/installer.cpp \
./src/data/pack.cpp ./src/util/io/get_member.cpp \
./src/util/io/reader.cpp ./src/util/io/package_manager.cpp \
./src/util/io/package.cpp ./src/util/io/writer.cpp \
./src/util/rotation.cpp ./src/util/tagged_string.cpp \
......@@ -551,6 +556,8 @@ src/gfx/$(DEPDIR)/$(am__dirstamp):
src/gfx/$(DEPDIR)/$(am__dirstamp)
./src/gfx/mask_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
src/gfx/$(DEPDIR)/$(am__dirstamp)
./src/gfx/generated_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
src/gfx/$(DEPDIR)/$(am__dirstamp)
src/gui/control/$(am__dirstamp):
@$(mkdir_p) ./src/gui/control
@: > src/gui/control/$(am__dirstamp)
......@@ -694,6 +701,8 @@ src/gui/$(DEPDIR)/$(am__dirstamp):
src/gui/$(DEPDIR)/$(am__dirstamp)
./src/gui/image_slice_window.$(OBJEXT): src/gui/$(am__dirstamp) \
src/gui/$(DEPDIR)/$(am__dirstamp)
./src/gui/html_export_window.$(OBJEXT): src/gui/$(am__dirstamp) \
src/gui/$(DEPDIR)/$(am__dirstamp)
./src/gui/images_export_window.$(OBJEXT): src/gui/$(am__dirstamp) \
src/gui/$(DEPDIR)/$(am__dirstamp)
src/script/$(am__dirstamp):
......@@ -842,6 +851,10 @@ src/data/$(DEPDIR)/$(am__dirstamp):
src/data/$(DEPDIR)/$(am__dirstamp)
./src/data/export_template.$(OBJEXT): src/data/$(am__dirstamp) \
src/data/$(DEPDIR)/$(am__dirstamp)
./src/data/installer.$(OBJEXT): src/data/$(am__dirstamp) \
src/data/$(DEPDIR)/$(am__dirstamp)
./src/data/pack.$(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)
......@@ -925,8 +938,10 @@ mostlyclean-compile:
-rm -f ./src/data/format/mtg_editor.$(OBJEXT)
-rm -f ./src/data/format/mws.$(OBJEXT)
-rm -f ./src/data/game.$(OBJEXT)
-rm -f ./src/data/installer.$(OBJEXT)
-rm -f ./src/data/keyword.$(OBJEXT)
-rm -f ./src/data/locale.$(OBJEXT)
-rm -f ./src/data/pack.$(OBJEXT)
-rm -f ./src/data/set.$(OBJEXT)
-rm -f ./src/data/settings.$(OBJEXT)
-rm -f ./src/data/statistics.$(OBJEXT)
......@@ -937,6 +952,7 @@ mostlyclean-compile:
-rm -f ./src/gfx/blend_image.$(OBJEXT)
-rm -f ./src/gfx/color.$(OBJEXT)
-rm -f ./src/gfx/combine_image.$(OBJEXT)
-rm -f ./src/gfx/generated_image.$(OBJEXT)
-rm -f ./src/gfx/image_effects.$(OBJEXT)
-rm -f ./src/gfx/mask_image.$(OBJEXT)
-rm -f ./src/gfx/polynomial.$(OBJEXT)
......@@ -960,6 +976,7 @@ mostlyclean-compile:
-rm -f ./src/gui/control/select_card_list.$(OBJEXT)
-rm -f ./src/gui/control/text_ctrl.$(OBJEXT)
-rm -f ./src/gui/drop_down_list.$(OBJEXT)
-rm -f ./src/gui/html_export_window.$(OBJEXT)
-rm -f ./src/gui/icon_menu.$(OBJEXT)
-rm -f ./src/gui/image_slice_window.$(OBJEXT)
-rm -f ./src/gui/images_export_window.$(OBJEXT)
......@@ -1046,8 +1063,10 @@ include ./src/data/$(DEPDIR)/export_template.Po
include ./src/data/$(DEPDIR)/field.Po
include ./src/data/$(DEPDIR)/font.Po
include ./src/data/$(DEPDIR)/game.Po
include ./src/data/$(DEPDIR)/installer.Po
include ./src/data/$(DEPDIR)/keyword.Po
include ./src/data/$(DEPDIR)/locale.Po
include ./src/data/$(DEPDIR)/pack.Po
include ./src/data/$(DEPDIR)/set.Po
include ./src/data/$(DEPDIR)/settings.Po
include ./src/data/$(DEPDIR)/statistics.Po
......@@ -1081,6 +1100,7 @@ include ./src/gfx/$(DEPDIR)/bezier.Po
include ./src/gfx/$(DEPDIR)/blend_image.Po
include ./src/gfx/$(DEPDIR)/color.Po
include ./src/gfx/$(DEPDIR)/combine_image.Po
include ./src/gfx/$(DEPDIR)/generated_image.Po
include ./src/gfx/$(DEPDIR)/image_effects.Po
include ./src/gfx/$(DEPDIR)/mask_image.Po
include ./src/gfx/$(DEPDIR)/polynomial.Po
......@@ -1090,6 +1110,7 @@ include ./src/gfx/$(DEPDIR)/rotate_image.Po
include ./src/gui/$(DEPDIR)/about_window.Po
include ./src/gui/$(DEPDIR)/card_select_window.Po
include ./src/gui/$(DEPDIR)/drop_down_list.Po
include ./src/gui/$(DEPDIR)/html_export_window.Po
include ./src/gui/$(DEPDIR)/icon_menu.Po
include ./src/gui/$(DEPDIR)/image_slice_window.Po
include ./src/gui/$(DEPDIR)/images_export_window.Po
......
Makefile.am
View file @ a80dc093
......@@ -41,6 +41,7 @@ magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
magicseteditor_SOURCES += ./src/gfx/mask_image.cpp
magicseteditor_SOURCES += ./src/gfx/generated_image.cpp
magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
magicseteditor_SOURCES += ./src/gui/control/graph.cpp
magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
......@@ -89,6 +90,7 @@ magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
magicseteditor_SOURCES += ./src/gui/print_window.cpp
magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
magicseteditor_SOURCES += ./src/gui/html_export_window.cpp
magicseteditor_SOURCES += ./src/gui/images_export_window.cpp
magicseteditor_SOURCES += ./src/script/script_manager.cpp
magicseteditor_SOURCES += ./src/script/script.cpp
......@@ -139,6 +141,8 @@ magicseteditor_SOURCES += ./src/data/statistics.cpp
magicseteditor_SOURCES += ./src/data/set.cpp
magicseteditor_SOURCES += ./src/data/symbol_font.cpp
magicseteditor_SOURCES += ./src/data/export_template.cpp
magicseteditor_SOURCES += ./src/data/installer.cpp
magicseteditor_SOURCES += ./src/data/pack.cpp
magicseteditor_SOURCES += ./src/util/io/get_member.cpp
magicseteditor_SOURCES += ./src/util/io/reader.cpp
magicseteditor_SOURCES += ./src/util/io/package_manager.cpp
......
configure.ac
View file @ a80dc093
......@@ -10,7 +10,7 @@ AC_INIT(magicseteditor, 0.3.0, twanvl@users.sourceforge.net)
AC_CONFIG_SRCDIR([src/main.cpp])
# TODO: Actually use the config header
AC_CONFIG_HEADER([src/config.h])
CXXFLAGS = [-g3 -O0]
CXXFLAGS = [-g3 -O0 ]
AM_INIT_AUTOMAKE([-Wall foreign])
......@@ -22,7 +22,7 @@ AC_PROG_CXX
# Check for wxWidgets
AM_OPTIONS_WXCONFIG
AM_PATH_WXCONFIG(2.6.0,wxWin=1)
AM_PATH_WXCONFIG(2.8.0,wxWin=1)
if test "$wxWin" != 1; then
AC_MSG_ERROR([
wxWindows must be installed on your system
......
src/gui/control/graph.cpp
View file @ a80dc093
......@@ -79,7 +79,7 @@ GraphData::GraphData(const GraphDataPre& d)
}
} else if (a->order) {
// specific group order
FOR_EACH_CONST(gn, *a->order) {
FOR_EACH_CONST(gn, (*(a->order))) {
UInt count = counts[gn];
a->groups.push_back(GraphGroup(gn, count));
a->max = max(a->max, count);
......
src/gui/control/image_card_list.cpp
View file @ a80dc093
......@@ -12,6 +12,7 @@
#include <data/game.hpp>
#include <data/card.hpp>
#include <gfx/gfx.hpp>
#include <wx/imaglist.h>
DECLARE_TYPEOF_COLLECTION(FieldP);
......
src/gui/control/item_list.cpp
View file @ a80dc093
......@@ -8,6 +8,7 @@
#include <gui/control/item_list.hpp>
#include <gui/util.hpp>
#include <wx/imaglist.h>
// ----------------------------------------------------------------------------- : ItemList
......@@ -141,14 +142,14 @@ void ItemList::sortBy(long column, bool ascending) {
refreshList();
}
void ItemList::SetColumnImage(int col, int image) {
// The wx version of this function is broken,
// setting the wxLIST_MASK_IMAGE also sets the FORMAT flag, so we lose alignment info
wxListItem item;
item.SetMask(wxLIST_MASK_IMAGE | wxLIST_MASK_FORMAT);
GetColumn(col, item);
item.SetImage(image);
SetColumn(col, item);
void ItemList::SetColumnImage(int col, int image) {
// The wx version of this function is broken,
// setting the wxLIST_MASK_IMAGE also sets the FORMAT flag, so we lose alignment info
wxListItem item;
item.SetMask(wxLIST_MASK_IMAGE | wxLIST_MASK_FORMAT);
GetColumn(col, item);
item.SetImage(image);
SetColumn(col, item);
}
// ----------------------------------------------------------------------------- : ItemList : Window events
......
src/gui/control/select_card_list.cpp
View file @ a80dc093
......@@ -9,6 +9,7 @@
#include <gui/control/select_card_list.hpp>
#include <gui/util.hpp>
#include <data/card.hpp>
#include <wx/imaglist.h>
DECLARE_TYPEOF_COLLECTION(CardP);
......
src/gui/image_slice_window.hpp
View file @ a80dc093
......@@ -10,6 +10,7 @@
// ----------------------------------------------------------------------------- : Includes
#include <util/prec.hpp>
#include <wx/spinctrl.h>
class ImageSlicePreview;
class ImageSliceSelector;
......
src/gui/preferences_window.cpp
View file @ a80dc093
......@@ -13,6 +13,7 @@
#include <util/io/package_manager.hpp>
#include <wx/spinctrl.h>
#include <wx/filename.h>
#include <wx/notebook.h>
// ----------------------------------------------------------------------------- : Preferences pages
......
src/gui/value/choice.cpp
View file @ a80dc093
......@@ -12,6 +12,7 @@
#include <data/action/value.hpp>
#include <data/stylesheet.hpp>
#include <script/image.hpp>
#include <wx/imaglist.h>
DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
......
src/gui/value/text.cpp
View file @ a80dc093
......@@ -196,8 +196,8 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
}
break;
default:
// if (ev.GetKeyCode() >= _(' ') /*&& ev.GetKeyCode() == (int)ev.GetRawKeyCode()*/) {
if (ev.GetKeyCode() >= _(' ') && ev.GetKeyCode() == (int)ev.GetRawKeyCode()) {
if (ev.GetKeyCode() >= _(' ') /*&& ev.GetKeyCode() == (int)ev.GetRawKeyCode()*/) {
// if (ev.GetKeyCode() >= _(' ') && ev.GetKeyCode() == (int)ev.GetRawKeyCode()) {
// TODO: Find a more correct way to determine normal characters,
// this might not work for internationalized input.
// It might also not be portable!
......
src/util/order_cache.hpp
View file @ a80dc093
......@@ -16,7 +16,7 @@
/// Object that cashes an ordered version of a list of items, for finding the position of objects
/** Can be used as a map "void* -> int" for finding the position of an object */
template <typename T>
class OrderCache : public IntrusivePtrBase<OrderCache> {
class OrderCache : public IntrusivePtrBase<OrderCache<T> > {
public:
/// Initialize the order cache, ordering the keys by their string values from the other vector
/** @pre keys.size() == values.size() */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment