From 439ea018d209dc45cb41be080aade5eeeda215a1 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 18 Aug 2013 14:56:20 +0000
Subject: [PATCH] *CtrlLib: TreeCtrl now using GetMinSize for widgets (instead
 of GetStdSize), OptionTree::SetOption/SetChildren now protected (thanks
 Typhoor)

git-svn-id: svn://ultimatepp.org/upp/trunk@6249 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/TreeCtrl.cpp | 2 +-
 uppsrc/CtrlLib/TreeCtrl.h   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/uppsrc/CtrlLib/TreeCtrl.cpp b/uppsrc/CtrlLib/TreeCtrl.cpp
index 07fd9a606..5774aab13 100644
--- a/uppsrc/CtrlLib/TreeCtrl.cpp
+++ b/uppsrc/CtrlLib/TreeCtrl.cpp
@@ -115,7 +115,7 @@ Size   TreeCtrl::Item::GetValueSize(const Display *treedisplay) const
 Size   TreeCtrl::Item::GetCtrlSize() const
 {
 	if(!ctrl) return Size(0, 0);
-	Size csz = ctrl->GetStdSize();
+	Size csz = ctrl->GetMinSize();
 	return Size(Nvl(size.cx, csz.cx), Nvl(size.cy, csz.cy));
 }
 
diff --git a/uppsrc/CtrlLib/TreeCtrl.h b/uppsrc/CtrlLib/TreeCtrl.h
index 6ed369218..fedf82406 100644
--- a/uppsrc/CtrlLib/TreeCtrl.h
+++ b/uppsrc/CtrlLib/TreeCtrl.h
@@ -327,8 +327,9 @@ class OptionTree : public TreeCtrl {
 	Array<Option>    aux;
 	bool             manualmode;
 
-	void SetOption(int i);
-	void SetChildren(int id, bool b);
+protected:
+	virtual void SetOption(int id);
+	virtual void SetChildren(int id, bool b);
 
 public:
 	Callback WhenOption;