From 3e4b80795c2ff40c1d4e57d3db60bebdc3bb187f Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 2 Dec 2010 14:13:06 +0000
Subject: [PATCH] *CtrlLib: TreeCtrl::Insert fix, *CtrlCore: constness issues

git-svn-id: svn://ultimatepp.org/upp/trunk@2883 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/CtrlCore.h             | 4 ++--
 uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp | 3 ++-
 uppsrc/CtrlLib/TreeCtrl.h              | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index 48da92eb9..e7c98d0a5 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -1180,7 +1180,7 @@ public:
 	bool    SetWantFocus();
 	Ctrl&   InitFocus(bool ft = true)          { initfocus = ft; return *this; }
 	Ctrl&   NoInitFocus()                      { return InitFocus(false); }
-	bool    IsInitFocus()                      { return initfocus; }
+	bool    IsInitFocus() const                { return initfocus; }
 	Ctrl   *GetFocusChild() const              { return HasChild(FocusCtrl()) ? ~FocusCtrl() : NULL; }
 	Ctrl   *GetFocusChildDeep() const          { return HasChildDeep(FocusCtrl()) ? ~FocusCtrl() : NULL; }
 
@@ -1230,7 +1230,7 @@ public:
 	Ctrl&   TransparentBackPaint()             { backpaint = TRANSPARENTBACKPAINT; return *this; }
 	Ctrl&   NoBackPaint()                      { return BackPaint(NOBACKPAINT); }
 	Ctrl&   BackPaintHint();
-	int     GetBackPaint()                     { return backpaint; }
+	int     GetBackPaint() const               { return backpaint; }
 	Ctrl&   Transparent(bool bp = true)        { transparent = bp; return *this; }
 	Ctrl&   NoTransparent()                    { return Transparent(false); }
 	bool    IsTransparent() const              { return transparent; }
diff --git a/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
index 942097138..c2c7aa600 100644
--- a/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
+++ b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
@@ -1877,7 +1877,8 @@ ckPaint]()&]
 [s7;i1120;a17; [*/ Return value]-|BackPaint(NOBACKPAINT).&]
 [s3;%- &]
 [s4;%- &]
-[s5;:Ctrl`:`:GetBackPaint`(`):%- [@(0.0.255) int]_[* GetBackPaint]()&]
+[s5;:Ctrl`:`:GetBackPaint`(`)const:%- [@(0.0.255) int]_[* GetBackPaint]()_[@(0.0.255) const
+]&]
 [s7;i1120;a17; [*/ Return value]-|Current back`-paint mode of Ctrl.&]
 [s3;%- &]
 [s4;%- &]
diff --git a/uppsrc/CtrlLib/TreeCtrl.h b/uppsrc/CtrlLib/TreeCtrl.h
index 46991968d..3ef655605 100644
--- a/uppsrc/CtrlLib/TreeCtrl.h
+++ b/uppsrc/CtrlLib/TreeCtrl.h
@@ -402,7 +402,7 @@ public:
 	virtual Value GetData() const;
 
 private:
-	PopUpTree        tree;
+	PopUpTree          tree;
 	const Display     *valuedisplay;
 	DisplayWithIcon    icond;
 	int                dropwidth;