From c262b72ec9cfec63bd91a0df0fc714db04ef51f1 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 26 May 2013 15:55:18 +0000
Subject: [PATCH] ScatterCtrl: now GTK backend compatible, fixed some warnings

git-svn-id: svn://ultimatepp.org/upp/trunk@6104 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ScatterCtrl/ScatterCtrl.cpp          | 9 +++------
 uppsrc/ScatterDraw/DataSource.h             | 4 ++--
 uppsrc/ScatterDraw/PieDraw.cpp              | 5 +++--
 uppsrc/Skylark/App.cpp                      | 1 -
 uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp | 4 ++++
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.cpp b/uppsrc/ScatterCtrl/ScatterCtrl.cpp
index 6f2f580e8..8f6bae6a7 100644
--- a/uppsrc/ScatterCtrl/ScatterCtrl.cpp
+++ b/uppsrc/ScatterCtrl/ScatterCtrl.cpp
@@ -65,6 +65,8 @@ void ScatterCtrl::Paint(Draw& w)
 	} else {
 		ImageBuffer ib(GetSize());
 		BufferPainter bp(ib, mode);
+		bp.Clear(White());
+		PlotTexts(bp, GetSize(), 1);
 		ScatterCtrl::SetDrawing(bp, GetSize(), 1);
 		w.DrawImage(0, 0, ib);
 		PlotTexts(w, GetSize(), 1);
@@ -233,12 +235,7 @@ void ScatterCtrl::Scrolling(bool down, Point &pt, bool isOut)
 			butDownY = pt.y;	
 			isScrolling = true;
 			INTERLOCKED { 
-#ifdef PLATFORM_WIN32
-				static Image img = Win32Cursor(IDC_SIZEALL);
-#else
-				static Image img = X11Cursor(XC_fleur);
-#endif
-				mouseImg = Ctrl::OverrideCursor(img);
+				mouseImg = Ctrl::OverrideCursor(Image::SizeAll());
 			}
 		}
 	} else {
diff --git a/uppsrc/ScatterDraw/DataSource.h b/uppsrc/ScatterDraw/DataSource.h
index a3668799c..cdf90699a 100644
--- a/uppsrc/ScatterDraw/DataSource.h
+++ b/uppsrc/ScatterDraw/DataSource.h
@@ -135,7 +135,7 @@ private:
 	const Vector<double> *xData, *yData;
 
 public:
-	VectorDouble(const Vector<double> &yData, Vector<double> &xData) : yData(&yData), xData(&xData) {}
+	VectorDouble(const Vector<double> &yData, Vector<double> &xData) : xData(&xData), yData(&yData) {}
 	virtual inline double y(int64 id)	{return (*yData)[int(id)];}
 	virtual inline double x(int64 id) 	{return (*xData)[int(id)];}
 	virtual inline int64 GetCount()		{return xData->GetCount();}
@@ -146,7 +146,7 @@ private:
 	const Upp::Array<double> *xData, *yData;
 
 public:
-	ArrayDouble(const Upp::Array<double> &yData, Upp::Array<double> &xData) : yData(&yData), xData(&xData) {}
+	ArrayDouble(const Upp::Array<double> &yData, Upp::Array<double> &xData) : xData(&xData), yData(&yData) {}
 	virtual inline double y(int64 id)	{return (*yData)[int(id)];}
 	virtual inline double x(int64 id) 	{return (*xData)[int(id)];}
 	virtual inline int64 GetCount()		{return xData->GetCount();}
diff --git a/uppsrc/ScatterDraw/PieDraw.cpp b/uppsrc/ScatterDraw/PieDraw.cpp
index e2d61742c..8af68b334 100644
--- a/uppsrc/ScatterDraw/PieDraw.cpp
+++ b/uppsrc/ScatterDraw/PieDraw.cpp
@@ -215,8 +215,9 @@ Image PieDraw::GetImage(int scale)
 	return Image(idraw.GetResult());
 }
 
-PieDraw::PieDraw(): backColor(White), titleFont(StdFont(16)), titlePos(TOP), titleGap(2),
-					titleColor(Black), showPercent(true), percentBack(Null),
+PieDraw::PieDraw(): backColor(White), titleFont(StdFont(16)),
+                    titleColor(Black), titlePos(TOP), titleGap(2),
+					showPercent(true), percentBack(Null),
 					legendFont(StdFont()), legendTextColor(Black), legendBackColor(Null),
 					showLegend(true), legendLeft(10), legendTop(Null), legendWidth(60), 
 					legendHeight(120), pieAngle(0), pieMarginLeft(40), pieMarginTop(40), 
diff --git a/uppsrc/Skylark/App.cpp b/uppsrc/Skylark/App.cpp
index bf33e941f..a2c9e903b 100644
--- a/uppsrc/Skylark/App.cpp
+++ b/uppsrc/Skylark/App.cpp
@@ -97,7 +97,6 @@ void SkylarkApp::Quit()
 	s.Connect("127.0.0.1", port);
 }
 
-
 void SkylarkApp::Main()
 {
 	Buffer<Thread> uwt(threads);
diff --git a/uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp b/uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp
index 8edb1af41..5e480cf08 100644
--- a/uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp
+++ b/uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp
@@ -90,6 +90,10 @@ the loop used to process Http requests.&]
 [s2; This method should be called from APP`_MAIN to start Skylark 
 application. There can be only one SkylarkApp in single binary.&]
 [s3; &]
+[s4;%- &]
+[s5;:SkylarkApp`:`:Quit`(`):%- [@(0.0.255) void]_[* Quit]()&]
+[s2; Quits the Skylark application (can be called from another thread).&]
+[s3;%- &]
 [s4; &]
 [s5;:SkylarkApp`:`:TheApp`(`):%- [@(0.0.255) static] [_^SkylarkApp^ SkylarkApp][@(0.0.255) `&
 ]_[* TheApp]()&]