Fixed input.

Update configure script to wxWidgets 2.8
Added required 2.8 includes.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@382 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2007-05-15 16:41:08 +00:00
parent 99bd13ee0b
commit 82a7690909
13 changed files with 59 additions and 28 deletions
+1 -1
View File
@@ -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);
+1
View File
@@ -12,6 +12,7 @@
#include <data/game.hpp>
#include <data/card.hpp>
#include <gfx/gfx.hpp>
#include <wx/imaglist.h>
DECLARE_TYPEOF_COLLECTION(FieldP);
+9 -8
View File
@@ -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
+1
View File
@@ -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);
+1
View File
@@ -10,6 +10,7 @@
// ----------------------------------------------------------------------------- : Includes
#include <util/prec.hpp>
#include <wx/spinctrl.h>
class ImageSlicePreview;
class ImageSliceSelector;
+1
View File
@@ -13,6 +13,7 @@
#include <util/io/package_manager.hpp>
#include <wx/spinctrl.h>
#include <wx/filename.h>
#include <wx/notebook.h>
// ----------------------------------------------------------------------------- : Preferences pages
+1
View File
@@ -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);
+2 -2
View File
@@ -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!