github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

bazaar: Property, ValueCtrl, CtrlProp: namespace fixes and some cleanup

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3865 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
kohait 2011-09-15 23:17:59 +00:00
parent 471c35bf4a
commit 9b18b6c807
48 changed files with 194 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bazaar/CtrlProp/Button.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(Button, Pusher)
END_PROPERTIES
PROPS(Ctrl, Button, Pusher)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/ButtonOption.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetLabel(const Value& v, ButtonOption& o) { if(!IsString(v)) return false; o.SetLabel(v); return true; }
bool PropGetLabel(Value& v, const ButtonOption& o) { v = o.GetLabel(); return true; }
@ -9,3 +10,5 @@ PROPERTY("label", PropSetLabel, PropGetLabel)
END_PROPERTIES
PROPS(Ctrl, ButtonOption, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/Ctrl.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetData(const Value& v, Ctrl& o) { o.SetData(v); return true; }
bool PropGetData(Value& v, const Ctrl& o) { v = o.GetData(); return true; }
@ -54,3 +55,5 @@ END_PROPERTIES
GETSETPROP_DUMMY(Ctrl, EmptyClass)
PROPS(Ctrl, Ctrl, EmptyClass)
END_UPP_NAMESPACE

2
bazaar/CtrlProp/CtrlProp.upp
View file

@ -8,7 +8,6 @@ uses
Gen;
file
CtrlPropCommon.h,
PropList.h,
PropList.cpp,
PropList.lay,
@ -17,6 +16,7 @@ file
PropEdit.lay,
CtrlProp.h,
Props readonly separator,
CtrlPropCommon.h,
Ctrl.icpp,
Pusher.icpp,
Button.icpp,

8
bazaar/CtrlProp/CtrlPropCommon.h
View file

@ -1,13 +1,11 @@
#ifndef _CtrlProp_CtrlPropCommon_h
#define _CtrlProp_CtrlPropCommon_h
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
#include <Property/Property.h>
#include <Gen/VTypes.h>
#include <CtrlLib/CtrlLib.h>
//////////////////////
NAMESPACE_UPP
DEC_PROPERTIES(Ctrl, EmptyClass)
DEC_PROPERTIES(Pusher, Ctrl)
@ -48,5 +46,7 @@ DEC_PROPERTIES(Picture, Ctrl)
DEC_PROPERTIES(SeparatorCtrl, Ctrl)
DEC_PROPERTIES(SliderCtrl, Ctrl)
END_UPP_NAMESPACE
#endif

5
bazaar/CtrlProp/DisplayCtrl.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(DisplayCtrl, Ctrl)
END_PROPERTIES
PROPS(Ctrl, DisplayCtrl, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/DocEdit.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetAutoHideSb(const Value& v, DocEdit& o) { if(!IsNumber(v)) return false; o.AutoHideSb(v); return true; }
bool PropGetAutoHideSb(Value& v, const DocEdit& o) { v = o.IsAutoHideSb(); return true; }
@ -15,3 +16,5 @@ PROPERTY("eofline", PropSetEofLine, PropGetEofLine)
END_PROPERTIES
PROPS(Ctrl, DocEdit, TextCtrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditDate.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetMin(const Value& v, EditDate& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
bool PropGetMin(Value& v, const EditDate& o) { v = o.GetMin(); return true; }
@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
END_PROPERTIES
PROPS(Ctrl, EditDate, EditField)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditDateNotNull.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditDateNotNull, EditDate)
END_PROPERTIES
PROPS(Ctrl, EditDateNotNull, EditDate)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditDouble.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetMin(const Value& v, EditDouble& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
bool PropGetMin(Value& v, const EditDouble& o) { v = o.GetMin(); return true; }
@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
END_PROPERTIES
PROPS(Ctrl, EditDouble, EditField)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditDoubleNotNull.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditDoubleNotNull, EditDouble)
END_PROPERTIES
PROPS(Ctrl, EditDoubleNotNull, EditDouble)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditDoubleNotNullSpin.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditDoubleNotNullSpin, EditDoubleSpin)
END_PROPERTIES
PROPS(Ctrl, EditDoubleNotNullSpin, EditDoubleSpin)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditDoubleSpin.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetInc(const Value& v, EditDoubleSpin& o) { if(!IsNumber(v)) return false; o.SetInc(v); return true; }
bool PropGetInc(Value& v, const EditDoubleSpin& o) { v = o.GetInc(); return true; }
@ -12,3 +13,5 @@ PROPERTY("showspin", PropSetShowSpin, PropGetShowSpin)
END_PROPERTIES
PROPS(Ctrl, EditDoubleSpin, EditDouble)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditField.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetPassword(const Value& v, EditField& o) { if(!IsNumber(v)) return false; o.Password(v); return true; }
bool PropGetPassword(Value& v, const EditField& o) { v = o.IsPassword(); return true; }
@ -27,3 +28,5 @@ PROPERTY("alignright", PropSetAlignRight, PropGetAlignRight)
END_PROPERTIES
PROPS(Ctrl, EditField, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditInt.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetMin(const Value& v, EditInt& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
bool PropGetMin(Value& v, const EditInt& o) { v = o.GetMin(); return true; }
@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
END_PROPERTIES
PROPS(Ctrl, EditInt, EditField)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditInt64.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetMin(const Value& v, EditInt64& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
bool PropGetMin(Value& v, const EditInt64& o) { v = o.GetMin(); return true; }
@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
END_PROPERTIES
PROPS(Ctrl, EditInt64, EditField)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditInt64NotNull.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditInt64NotNull, EditInt64)
END_PROPERTIES
PROPS(Ctrl, EditInt64NotNull, EditInt64)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditInt64NotNullSpin.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditInt64NotNullSpin, EditInt64Spin)
END_PROPERTIES
PROPS(Ctrl, EditInt64NotNullSpin, EditInt64Spin)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditInt64Spin.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetInc(const Value& v, EditInt64Spin& o) { if(!IsNumber(v)) return false; o.SetInc(v); return true; }
bool PropGetInc(Value& v, const EditInt64Spin& o) { v = o.GetInc(); return true; }
@ -12,3 +13,5 @@ PROPERTY("showspin", PropSetShowSpin, PropGetShowSpin)
END_PROPERTIES
PROPS(Ctrl, EditInt64Spin, EditInt64)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditIntNotNull.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditIntNotNull, EditInt)
END_PROPERTIES
PROPS(Ctrl, EditIntNotNull, EditInt)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditIntNotNullSpin.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditIntNotNullSpin, EditIntSpin)
END_PROPERTIES
PROPS(Ctrl, EditIntNotNullSpin, EditIntSpin)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditIntSpin.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetInc(const Value& v, EditIntSpin& o) { if(!IsNumber(v)) return false; o.SetInc(v); return true; }
bool PropGetInc(Value& v, const EditIntSpin& o) { v = o.GetInc(); return true; }
@ -12,3 +13,5 @@ PROPERTY("showspin", PropSetShowSpin, PropGetShowSpin)
END_PROPERTIES
PROPS(Ctrl, EditIntSpin, EditInt)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditString.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetMaxLen(const Value& v, EditString& o) { if(!IsNumber(v)) return false; o.MaxLen(v); return true; }
bool PropGetMaxLen(Value& v, const EditString& o) { v = o.GetMaxLength(); return true; }
@ -18,3 +19,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
END_PROPERTIES
PROPS(Ctrl, EditString, EditField)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditStringNotNull.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditStringNotNull, EditString)
END_PROPERTIES
PROPS(Ctrl, EditStringNotNull, EditString)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditTime.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetMin(const Value& v, EditTime& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
bool PropGetMin(Value& v, const EditTime& o) { v = o.GetMin(); return true; }
@ -18,3 +19,5 @@ PROPERTY("seconds", PropSetSeconds, PropGetSeconds)
END_PROPERTIES
PROPS(Ctrl, EditTime, EditField)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/EditTimeNotNull.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(EditTimeNotNull, EditTime)
END_PROPERTIES
PROPS(Ctrl, EditTimeNotNull, EditTime)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/ImageCtrl.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(ImageCtrl, Ctrl)
END_PROPERTIES
PROPS(Ctrl, ImageCtrl, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/Label.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetText(const Value& v, Label& o) { o.SetText(AsString(v)); return true; }
bool PropGetText(Value& v, const Label& o) { v = o.GetText(); return true; }
@ -9,3 +10,5 @@ PROPERTY("text", PropSetText, PropGetText)
END_PROPERTIES
PROPS(Ctrl, Label, StaticText)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/LabelBox.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(LabelBox, Label)
END_PROPERTIES
PROPS(Ctrl, LabelBox, Label)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/LineEdit.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetTabSize(const Value& v, LineEdit& o) { if(!IsNumber(v)) return false; o.TabSize(v); return true; }
bool PropGetTabSize(Value& v, const LineEdit& o) { v = o.GetTabSize(); return true; }
@ -18,3 +19,5 @@ PROPERTY("nohorzsb", PropSetNoHorzScrollbar, PropGetNoHorzScrollbar)
END_PROPERTIES
PROPS(Ctrl, LineEdit, TextCtrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/Option.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetBlackEdge(const Value& v, Option& o) { if(!IsNumber(v)) return false; o.BlackEdge(v); return true; }
bool PropGetBlackEdge(Value& v, const Option& o) { v = o.IsBlackEdge(); return true; }
@ -21,3 +22,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
END_PROPERTIES
PROPS(Ctrl, Option, Pusher)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/ParentCtrl.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(ParentCtrl, Ctrl)
END_PROPERTIES
PROPS(Ctrl, ParentCtrl, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/Picture.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(Picture, Ctrl)
END_PROPERTIES
PROPS(Ctrl, Picture, Ctrl)
END_UPP_NAMESPACE

3
bazaar/CtrlProp/PropEdit.cpp
View file

@ -1,5 +1,7 @@
#include "PropEdit.h"
NAMESPACE_UPP
PropEditCtrl::PropEditCtrl()
{
CtrlLayout(*this);
@ -167,3 +169,4 @@ void PropEdit::Serialize(Stream& s)
}
}
END_UPP_NAMESPACE

9
bazaar/CtrlProp/PropEdit.h
View file

@ -1,11 +1,12 @@
#ifndef _CtrlProp_PropEdit_h_
#define _CtrlProp_PropEdit_h_
#include "CtrlPropCommon.h"
#include <LogPosCtrl/LogPosCtrl.h>
#include <Property/Property.h>
#include <Gen/VTypes.h>
#include <ValueCtrl/ValueCtrl.h>
NAMESPACE_UPP
#define LAYOUTFILE <CtrlProp/PropEdit.lay>
#include <CtrlCore/lay.h>
@ -54,4 +55,6 @@ public:
PropEditCtrl pec;
};
END_UPP_NAMESPACE
#endif

4
bazaar/CtrlProp/PropList.cpp
View file

@ -1,5 +1,7 @@
#include "PropList.h"
NAMESPACE_UPP
PropListCtrl::PropListCtrl()
{
CtrlLayout(*this);
@ -47,3 +49,5 @@ PropList::PropList()
SetRect(plc.GetRect());
Add(plc.HSizePos().VSizePos(0,20));
}
END_UPP_NAMESPACE

9
bazaar/CtrlProp/PropList.h
View file

@ -1,11 +1,12 @@
#ifndef _CtrlProp_PropList_h_
#define _CtrlProp_PropList_h_
#include "CtrlPropCommon.h"
#include <LogPosCtrl/LogPosCtrl.h>
#include <Property/Property.h>
#include <Gen/VTypes.h>
#include <ValueCtrl/ValueCtrl.h>
NAMESPACE_UPP
#define LAYOUTFILE <CtrlProp/PropList.lay>
#include <CtrlCore/lay.h>
@ -39,4 +40,6 @@ public:
PropListCtrl plc;
};
END_UPP_NAMESPACE
#endif

5
bazaar/CtrlProp/Pusher.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetLabel(const Value& v, Pusher& o) { if(!IsString(v)) return false; o.SetLabel(String(v)); return true; }
bool PropGetLabel(Value& v, const Pusher& o) { v = o.GetLabel(); return true; }
@ -14,3 +15,5 @@ PROPERTY("clickfocus", PropSetClickFocus, PropGetClickFocus)
END_PROPERTIES
PROPS(Ctrl, Pusher, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/SeparatorCtrl.icpp
View file

@ -1,7 +1,10 @@
#include "CtrlProp.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
PROPERTIES(SeparatorCtrl, Ctrl)
END_PROPERTIES
PROPS(Ctrl, SeparatorCtrl, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/SliderCtrl.icpp
View file

@ -1,7 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
//SliderCtrl
NAMESPACE_UPP
bool PropSetMin(const Value& v, SliderCtrl& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
bool PropGetMin(Value& v, const SliderCtrl& o) { v = o.GetMin(); return true; }
@ -17,3 +16,5 @@ PROPERTY("step", PropSetStep, PropGetStep)
END_PROPERTIES
PROPS(Ctrl, SliderCtrl, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/StaticRect.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetBackground(const Value& v, StaticRect& o) { if(!v.Is<Color>()) return false; o.Background(v); return true; }
bool PropGetBackground(Value& v, const StaticRect& o) { v = o.GetBackground(); return true; }
@ -9,3 +10,5 @@ PROPERTY("background", PropSetBackground, PropGetBackground)
END_PROPERTIES
PROPS(Ctrl, StaticRect, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/StaticText.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetInk(const Value& v, StaticText& o) { if(!v.Is<Color>()) return false; o.SetInk(v); return true; }
bool PropGetInk(Value& v, const StaticText& o) { v = o.GetInk(); return true; }
@ -15,3 +16,5 @@ PROPERTY("align", PropSetAlign, PropGetAlign)
END_PROPERTIES
PROPS(Ctrl, StaticText, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/Switch.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetLabel(const Value& v, Switch& o) { o.SetLabel(AsString(v)); return true; }
bool PropGetLabel(Value& v, const Switch& o) { v = o.GetLabel(); return true; }
@ -9,3 +10,5 @@ PROPERTY("label", PropSetLabel, PropGetLabel)
END_PROPERTIES
PROPS(Ctrl, Switch, Ctrl)
END_UPP_NAMESPACE

5
bazaar/CtrlProp/TextCtrl.icpp
View file

@ -1,5 +1,6 @@
#include "CtrlPropCommon.h"
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
bool PropSetUndoSteps(const Value& v, TextCtrl& o) { if(!IsNumber(v)) return false; o.UndoSteps(v); return true; }
bool PropGetUndoSteps(Value& v, const TextCtrl& o) { v = o.GetUndoSteps(); return true; }
@ -18,3 +19,5 @@ PROPERTY("nobackground", PropSetNoBackground, PropGetNoBackground)
END_PROPERTIES
PROPS(Ctrl, TextCtrl, Ctrl)
END_UPP_NAMESPACE

4
bazaar/Property/Property.cpp
View file

@ -1,5 +1,7 @@
#include "Property.h"
NAMESPACE_UPP
void AddToValueArray(Value& v, const Vector<String>& k)
{
if(!v.Is<ValueArray>())
@ -11,3 +13,5 @@ void AddToValueArray(Value& v, const Vector<String>& k)
for(int i = 0; i < k.GetCount(); i++)
vv << k[i];
}
END_UPP_NAMESPACE

9
bazaar/Property/Property.h
View file

@ -1,9 +1,9 @@
#ifndef _Property_Property_h
#define _Property_Property_h
#include <CtrlLib/CtrlLib.h>
#include <Core/Core.h>
using namespace Upp;
NAMESPACE_UPP
template<class T>
struct Property
@ -39,6 +39,9 @@ struct Accessor
bool Set(const T& a) const { ASSERT(set); return set(a); }
bool Get(T& a) const { ASSERT(get); return get(a); }
inline T operator= (const T& a) const { Set(a); return a; }
inline operator T() const { T t; Get(t); return t; }
public:
const S set;
const G get;
@ -338,5 +341,7 @@ __base: return GetSetProp##BASE(c,p,v,f); \
\
END_UPP_NAMESPACE
#endif

4
bazaar/ValueCtrl/ValueCtrl.cpp
View file

@ -1,5 +1,7 @@
#include "ValueCtrl.h"
NAMESPACE_UPP
VectorMap<int, String>& GetValueTypeNoNameMap()
{
static VectorMap<int, String> _;
@ -212,3 +214,5 @@ void ValueCtrl::Updated()
else
SetText(v.ToString());
}
END_UPP_NAMESPACE

8
bazaar/ValueCtrl/ValueCtrl.h
View file

@ -3,8 +3,6 @@
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
#include <PopUpC/PopUpC.h>
#include <Gen/VTypes.h>
@ -12,13 +10,13 @@ using namespace Upp;
#include <WithEnterAction/WithEnterAction.h>
#include <Gen/Gen.h>
NAMESPACE_UPP
#define LAYOUTFILE <ValueCtrl/ValueCtrl.lay>
#include <CtrlCore/lay.h>
//For ValuePacker / RichValue<Value> and GCC
NAMESPACE_UPP
template<> inline bool IsNull(const Value& v) { return v.IsNull(); }
END_UPP_NAMESPACE
VectorMap<int, String>& GetValueTypeNoNameMap();
#define ADDVALUETYPENO(x) GetAdd(x, ASSTRING(x))
@ -285,5 +283,7 @@ public:
virtual Value GetData() const { return ErrorValue(EditString::GetData()); }
};
END_UPP_NAMESPACE
#endif