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

CtrlLib: StaticText::SetData reverted (backward compatibility problem)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11897 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-04-18 09:43:07 +00:00
parent ea65ce7b23
commit cc5128c249
2 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

23
uppsrc/CtrlLib/Static.cpp
View file

@ -2,29 +2,6 @@
namespace Upp {
void StaticText::SetData(const Value& v)
{
SetText(~v);
}
Value StaticText::GetData() const
{
return GetText();
}
void StaticText::Serialize(Stream& s)
{
GuiLock __;
Value x;
s % x;
for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
q->Serialize(s);
}
void StaticText::Jsonize(JsonIO& jio) {}
void StaticText::Xmlize(XmlIO& xio) {}
void StaticText::Paint(Draw& w)
{
Size sz = GetSize();

6
uppsrc/CtrlLib/StaticCtrl.h
View file

@ -4,12 +4,6 @@ public:
virtual Size GetMinSize() const;
virtual void LabelUpdate();
virtual void SetData(const Value& v);
virtual Value GetData() const;
virtual void Serialize(Stream& s);
virtual void Jsonize(JsonIO& jio);
virtual void Xmlize(XmlIO& xio);
public:
StaticText& SetFont(Font font) { LabelBase::SetFont(font); return *this; }
StaticText& SetInk(Color color) { LabelBase::SetInk(color); return *this; }