From 5bd126c78ad80ced29a77e4d825cce770e1028a0 Mon Sep 17 00:00:00 2001
From: kohait <kohait@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 22 Sep 2011 14:59:37 +0000
Subject: [PATCH] bazaar: CtrlProp and ValueAccessorEdit: some NULL inits

git-svn-id: svn://ultimatepp.org/upp/trunk@3901 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/CtrlProp/PropEdit.h                     | 2 +-
 bazaar/ValueAccessorEdit/ValueAccessorEdit.cpp | 1 +
 bazaar/ValueAccessorEdit/ValueAccessorEdit.h   | 2 ++
 bazaar/ValueAccessorEdit/ValueAccessorEdit.lay | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bazaar/CtrlProp/PropEdit.h b/bazaar/CtrlProp/PropEdit.h
index c94d891ef..2621b9c07 100644
--- a/bazaar/CtrlProp/PropEdit.h
+++ b/bazaar/CtrlProp/PropEdit.h
@@ -9,7 +9,7 @@ class PropEditCtrl : public AccessorMapCtrl
 {
 public:
 	typedef PropEditCtrl CLASSNAME;
-	PropEditCtrl() { WhenAction = THISBACK(OnAction); }
+	PropEditCtrl() : ctrl(NULL) { WhenAction = THISBACK(OnAction); }
 
 	void SetCtrl(Ctrl* c) { if(ctrl != c) { ctrl = c; UpdateCtrl(); } Update(); }
 	Ctrl* GetCtrl() const { return ctrl; }
diff --git a/bazaar/ValueAccessorEdit/ValueAccessorEdit.cpp b/bazaar/ValueAccessorEdit/ValueAccessorEdit.cpp
index e67d502b6..37aba60be 100644
--- a/bazaar/ValueAccessorEdit/ValueAccessorEdit.cpp
+++ b/bazaar/ValueAccessorEdit/ValueAccessorEdit.cpp
@@ -66,6 +66,7 @@ void ValueAccessorCtrl::Updated()
 //
 
 AccessorMapCtrl::AccessorMapCtrl()
+	: am(NULL)
 {
 	CtrlLayout(*this);
 	ac.AddColumn("Property");
diff --git a/bazaar/ValueAccessorEdit/ValueAccessorEdit.h b/bazaar/ValueAccessorEdit/ValueAccessorEdit.h
index 41362b51a..7bd48d5dd 100644
--- a/bazaar/ValueAccessorEdit/ValueAccessorEdit.h
+++ b/bazaar/ValueAccessorEdit/ValueAccessorEdit.h
@@ -14,6 +14,8 @@ class ValueAccessorEdit : public ParentCtrl {
 public:
 	typedef ValueAccessorEdit CLASSNAME;
 	typedef ValueAccessor VA;
+	
+	ValueAccessorEdit() : tg(NULL) {}
 
 	//need get set data because of serialize
 	virtual void SetData(const Value& v) { if(!tg) return; tg->set(v); }
diff --git a/bazaar/ValueAccessorEdit/ValueAccessorEdit.lay b/bazaar/ValueAccessorEdit/ValueAccessorEdit.lay
index ea480cf07..8a7d0407e 100644
--- a/bazaar/ValueAccessorEdit/ValueAccessorEdit.lay
+++ b/bazaar/ValueAccessorEdit/ValueAccessorEdit.lay
@@ -1,4 +1,4 @@
 LAYOUT(ValueAccessorEditLayout, 300, 100)
-	ITEM(ArrayCtrl, ac, Header(false).HSizePosZ(0, 0).VSizePosZ(0, 0))
+	ITEM(ArrayCtrl, ac, SetLineCy(25).VertGrid(false).Header(false).HSizePosZ(0, 0).VSizePosZ(0, 0))
 END_LAYOUT