From cc5128c2494a0049c4e0aa3e2e6b21144ffbff71 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 18 Apr 2018 09:43:07 +0000 Subject: [PATCH] CtrlLib: StaticText::SetData reverted (backward compatibility problem) git-svn-id: svn://ultimatepp.org/upp/trunk@11897 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/Static.cpp | 23 ----------------------- uppsrc/CtrlLib/StaticCtrl.h | 6 ------ 2 files changed, 29 deletions(-) diff --git a/uppsrc/CtrlLib/Static.cpp b/uppsrc/CtrlLib/Static.cpp index 8133eb808..a9fad14bc 100644 --- a/uppsrc/CtrlLib/Static.cpp +++ b/uppsrc/CtrlLib/Static.cpp @@ -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(); diff --git a/uppsrc/CtrlLib/StaticCtrl.h b/uppsrc/CtrlLib/StaticCtrl.h index 7d13b7733..3ebf51747 100644 --- a/uppsrc/CtrlLib/StaticCtrl.h +++ b/uppsrc/CtrlLib/StaticCtrl.h @@ -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; }