github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*ScatterCtrl: namespace fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10628 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2017-01-03 09:37:33 +00:00
parent e97c59d886
commit 40ae9a11b3
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/ScatterCtrl/PieCtrl.h
View file

@ -33,7 +33,7 @@ public:
PieCtrl& SetPercentBack(const Upp::Color& pbcolor) {PieDraw::SetPercentBack(pbcolor); return *this;}
PieCtrl& ShowLegend(bool show = true) {PieDraw::ShowLegend(show); return *this;}
PieCtrl& SetLegendFont(const Font& font) {PieDraw::SetLegendFont(font); return *this;}
PieCtrl& SetLegendFont(const Upp::Font& font) {PieDraw::SetLegendFont(font); return *this;}
PieCtrl& SetLegendTextColor(const Upp::Color& color){PieDraw::SetLegendTextColor(color); return *this;}
PieCtrl& SetLegendBackColor(const Upp::Color& color){PieDraw::SetLegendBackColor(color); return *this;}
PieCtrl& SetLegendLeft(const int& h) {PieDraw::SetLegendLeft(h); return *this;}

4
uppsrc/ScatterCtrl/PopUpText.cpp
View file

@ -1,3 +1,7 @@
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
#include "PopUpText.h"

6
uppsrc/ScatterCtrl/PopUpText.h
View file

@ -1,10 +1,6 @@
#ifndef _PopUpText_PopUpText_h
#define _PopUpText_PopUpText_h
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
class PopUpInfo : public StaticText {
Color color;
bool opened;
@ -12,7 +8,7 @@ class PopUpInfo : public StaticText {
public:
void Paint(Draw& w);
PopUpInfo& SetFont(Font font) { LabelBase::SetFont(font); return *this; }
PopUpInfo& SetFont(Upp::Font font) { LabelBase::SetFont(font); return *this; }
PopUpInfo& SetInk(Color color) { LabelBase::SetInk(color); return *this; }
PopUpInfo& SetAlign(int align) { LabelBase::SetAlign(align); return *this; }
PopUpInfo& SetImage(const Image& img, int spc = 0) { LabelBase::SetImage(img, spc); return *this; }

8
uppsrc/ScatterCtrl/ScatterCtrl.h
View file

@ -1,13 +1,15 @@
#ifndef _ScatterCtrl_ScatterCtrl_h
#define _ScatterCtrl_ScatterCtrl_h
#include "PopUpText.h"
#include <ScatterDraw/ScatterDraw.h>
#include <plugin/jpg/jpg.h>
#include <GridCtrl/GridCtrl.h>
using namespace Upp;
#include "PopUpText.h"
class EditDoubleLostFocus : public EditDouble {
public:
Callback WhenLostFocus;
@ -202,9 +204,9 @@ public:
ScatterCtrl& SetAxisColor(const Upp::Color& axis_color) {ScatterDraw::SetAxisColor(axis_color); return *this;};
ScatterCtrl& SetAxisWidth(int axis_width) {ScatterDraw::SetAxisWidth(axis_width); return *this;};
ScatterCtrl& SetTitle(const String& title) {ScatterDraw::SetTitle(title); return *this;};
ScatterCtrl& SetTitleFont(const Font& fontTitle) {ScatterDraw::SetTitleFont(fontTitle); return *this;};
ScatterCtrl& SetTitleFont(const Upp::Font& fontTitle) {ScatterDraw::SetTitleFont(fontTitle); return *this;};
ScatterCtrl& SetTitleColor(const Upp::Color& colorTitle) {ScatterDraw::SetTitleColor(colorTitle); return *this;};
ScatterCtrl& SetLabelsFont(const Font& fontLabels) {ScatterDraw::SetLabelsFont(fontLabels); return *this;};
ScatterCtrl& SetLabelsFont(const Upp::Font& fontLabels) {ScatterDraw::SetLabelsFont(fontLabels); return *this;};
ScatterCtrl& SetLabelsColor(const Upp::Color& colorLabels) {ScatterDraw::SetLabelsColor(colorLabels); return *this;};
ScatterCtrl& SetLabelX(const String& xLabel) {ScatterDraw::SetLabelX(xLabel); return *this;};
ScatterCtrl& SetLabelY(const String& yLabel) {ScatterDraw::SetLabelY(yLabel); return *this;};