From db587765b8105535908d25e758a73e355bf3cf7e Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 13 Dec 2010 14:05:36 +0000
Subject: [PATCH] CtrlCore: const issues

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

diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index e7c98d0a5..618971164 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -1158,7 +1158,7 @@ public:
 	Ctrl&   NoIgnoreMouse()                              { return IgnoreMouse(false); }
 	bool    HasMouse() const;
 	bool    HasMouseDeep() const;
-	bool    HasMouseInFrame(const Rect& r);
+	bool    HasMouseInFrame(const Rect& r) const;
 	bool    HasMouseIn(const Rect& r) const;
 	Point   GetMouseViewPos() const;
 	static Ctrl *GetMouseCtrl();
diff --git a/uppsrc/CtrlCore/CtrlMouse.cpp b/uppsrc/CtrlCore/CtrlMouse.cpp
index 57a2d134b..f06c28409 100644
--- a/uppsrc/CtrlCore/CtrlMouse.cpp
+++ b/uppsrc/CtrlCore/CtrlMouse.cpp
@@ -392,7 +392,7 @@ Ctrl   *Ctrl::GetMouseCtrl()
 	return mouseCtrl;
 }
 
-bool    Ctrl::HasMouseInFrame(const Rect& r)
+bool    Ctrl::HasMouseInFrame(const Rect& r) const
 {
 	GuiLock __;
 	if(!HasMouse())
diff --git a/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
index c2c7aa600..8eb112f87 100644
--- a/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
+++ b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
@@ -1535,8 +1535,14 @@ lay inside it.&]
 events.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:Ctrl`:`:HasMouseInFrame`(const Rect`&`):%- [@(0.0.255) bool]_[* HasMouseInFrame]([@(0.0.255) c
-onst]_[_^`:`:Rect^ Rect][@(0.0.255) `&]_[*@3 r])&]
+[s5;:Ctrl`:`:HasMouseDeep`(`)const:%- [@(0.0.255) bool]_[* HasMouseDeep]()_[@(0.0.255) cons
+t]&]
+[s2; Returns true if Ctrl or any of its descendants is target for 
+mouse events.&]
+[s3;%- &]
+[s4;%- &]
+[s5;:Ctrl`:`:HasMouseInFrame`(const Rect`&`)const:%- [@(0.0.255) bool]_[* HasMouseInFrame
+]([@(0.0.255) const]_[_^Rect^ Rect][@(0.0.255) `&]_[*@3 r])_[@(0.0.255) const]&]
 [s7;i1120;a17; [%-*C@3 r]-|rectangle in frame area.&]
 [s7;i1120;a17; [*/ Return value]-|true when Ctrl is target for mouse 
 events and mouse pointer is inside specified frame area rectangle.&]