1.1 --- a/core/MenuStyle_Base.h Thu Nov 21 19:26:10 2013 -0500
1.2 +++ b/core/MenuStyle_Base.h Sat Nov 30 10:51:28 2013 -0500
1.3 @@ -45,8 +45,6 @@
1.4 public:
1.5 CItem()
1.6 {
1.7 - info.setVoid();
1.8 - display.setVoid();
1.9 style = 0;
1.10 access = 0;
1.11 }
1.12 @@ -57,11 +55,24 @@
1.13 style = other->style;
1.14 access = other->access;
1.15 }
1.16 + CItem & operator =(ke::Moveable<CItem> other)
1.17 + {
1.18 + info = ke::Move(other->info);
1.19 + display = ke::Move(other->display);
1.20 + style = other->style;
1.21 + access = other->access;
1.22 + return *this;
1.23 + }
1.24 +
1.25 public:
1.26 ke::AString info;
1.27 - ke::AString display;
1.28 + ke::AutoPtr<ke::AString> display;
1.29 unsigned int style;
1.30 unsigned int access;
1.31 +
1.32 +private:
1.33 + CItem(const CItem &other) KE_DELETE;
1.34 + CItem &operator =(const CItem &other) KE_DELETE;
1.35 };
1.36
1.37 class CBaseMenuPlayer