From 075122668bf059c163bcd1ced30ab74540bc7495 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Tue, 7 Dec 2010 21:17:03 +0000
Subject: [PATCH] * compatibility with wxWdigets 2.9+: use HandleWindowEvent
 instead of ProcessEvent * compatibility with wxWdigets 2.9+: Vector2D:
 prevent ambiguous conversion errors * use wxBORDER_THEME for custom control

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1545 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/gui/control/graph.cpp | 9 +++++----
 src/gui/control/graph.hpp | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp
index 03f3564c..75d04bc2 100644
--- a/src/gui/control/graph.cpp
+++ b/src/gui/control/graph.cpp
@@ -486,7 +486,7 @@ void PieGraph::draw(RotatedDC& dc, int current, DrawLayer layer) const {
 	double size = min(rect.width, rect.height);
 	RealSize pie_size(size, size);
 	RealSize pie_size_large(size+20, size+20);
-	RealPoint pie_pos = rect.position() + rect.size() / 2;
+	RealPoint pie_pos = rect.position() + rect.size() * 0.5;
 	//RealPoint pos = align_in_rect(ALIGN_MIDDLE_CENTER, RealSize(size,size), rect);
 	// draw items
 	if (layer == LAYER_VALUES) {
@@ -572,7 +572,7 @@ void ScatterGraph::draw(RotatedDC& dc, const vector<int>& current, DrawLayer lay
 			UInt value = values[cur1 * axis2.groups.size() + cur2];
 			if (value) {
 				dc.SetBrush(lerp(bg,lerp(axis1.groups[cur1].color, axis2.groups[cur2].color, 0.5),0.5));
-				dc.DrawCircle(RealPoint(rect.left() + cur1 * size.width, rect.bottom() - (cur2+1) * size.height) + size/2, scale(value) * step + 5);
+				dc.DrawCircle(RealPoint(rect.left() + cur1 * size.width, rect.bottom() - (cur2+1) * size.height) + size*0.5, scale(value) * step + 5);
 			}
 		} else if (cur1 >= 0) {
 			dc.SetBrush(lerp(bg,axis1.groups[cur1].color,0.3));
@@ -1029,7 +1029,7 @@ void GraphContainer::add(const GraphP& graph) {
 // ----------------------------------------------------------------------------- : GraphControl
 
 GraphControl::GraphControl(Window* parent, int id)
-	: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS)
+	: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxBORDER_THEME)
 	, layout(GRAPH_TYPE_BAR)
 {}
 
@@ -1166,7 +1166,7 @@ void GraphControl::onChar(wxKeyEvent& ev) {
 			// we need this because of wxWANTS_CHARS
 			wxNavigationKeyEvent nev;
 			nev.SetDirection(!ev.ShiftDown());
-			GetParent()->ProcessEvent(nev);
+			GetParent()->HandleWindowEvent(nev);
 			} break;
 	}
 }
@@ -1225,4 +1225,5 @@ BEGIN_EVENT_TABLE(GraphControl, wxControl)
 	EVT_LEFT_DOWN	(GraphControl::onMouseDown)
 	EVT_MOTION		(GraphControl::onMotion)
 	EVT_CHAR		(GraphControl::onChar)
+	EVT_ERASE_BACKGROUND(GraphControl::onEraseBackground)
 END_EVENT_TABLE  ()
diff --git a/src/gui/control/graph.hpp b/src/gui/control/graph.hpp
index 95cd4365..d7e8b72d 100644
--- a/src/gui/control/graph.hpp
+++ b/src/gui/control/graph.hpp
@@ -372,6 +372,7 @@ class GraphControl : public wxControl {
 	DECLARE_EVENT_TABLE();
 	
 	void onPaint(wxPaintEvent&);
+	void onEraseBackground(wxEraseEvent&) {}
 	void onSize (wxSizeEvent&);
 	void onMouseDown(wxMouseEvent& ev);
 	void onMotion(wxMouseEvent& ev);