From 8dfe862ee8c1e6fe7065e1737fb3dce9cbab7841 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 29 Mar 2009 18:37:06 +0000
Subject: [PATCH] Minor fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@1024 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Mt.h             |  2 +-
 uppsrc/CtrlLib/LabelBase.cpp | 36 ------------------------------------
 uppsrc/CtrlLib/LabelBase.h   |  9 ---------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/uppsrc/Core/Mt.h b/uppsrc/Core/Mt.h
index 9804a9322..a1626eb25 100644
--- a/uppsrc/Core/Mt.h
+++ b/uppsrc/Core/Mt.h
@@ -453,7 +453,7 @@ public:
 	void  Enter()                {}
 	void  Leave()                {}
 
-	struct Lock;
+	class Lock;
 };
 
 typedef Mutex StaticMutex;
diff --git a/uppsrc/CtrlLib/LabelBase.cpp b/uppsrc/CtrlLib/LabelBase.cpp
index d6ed2d71a..8f56e968e 100644
--- a/uppsrc/CtrlLib/LabelBase.cpp
+++ b/uppsrc/CtrlLib/LabelBase.cpp
@@ -20,42 +20,6 @@ void CtrlsImageLook(Value *look, int i, const Image& image, int n)
 		*look++ = ChLookWith(CtrlsImg::Get(i++), image);
 }
 
-CtrlsImgLook& CtrlsImgLook::operator()(int i, int n)
-{
-	while(n-- > 0)
-		Add(CtrlsImg::Get(i++));
-	return *this;
-}
-
-CtrlsImgLook& CtrlsImgLook::operator()(int i, const Image& img, Color (*fn)(int i), int n)
-{
-	for(int q = 0; q < n; q++)
-		Add(ChLookWith(CtrlsImg::Get(i++), img, fn, q));
-	return *this;
-}
-
-CtrlsImgLook& CtrlsImgLook::operator()(int i, const Image& img, int n)
-{
-	for(int q = 0; q < n; q++)
-		Add(ChLookWith(CtrlsImg::Get(i++), img));
-	return *this;
-}
-
-CtrlsImgLook::CtrlsImgLook(int i, int n)
-{
-	operator()(i, n);
-}
-
-CtrlsImgLook::CtrlsImgLook(int i, const Image& img, Color (*fn)(int i), int n)
-{
-	operator()(i, img, fn, n);
-}
-
-CtrlsImgLook::CtrlsImgLook(int i, const Image& img, int n)
-{
-	operator()(i, img, n);
-}
-
 String DeAmp(const char *s)
 {
 	String out;
diff --git a/uppsrc/CtrlLib/LabelBase.h b/uppsrc/CtrlLib/LabelBase.h
index 820e2fa9c..182959b36 100644
--- a/uppsrc/CtrlLib/LabelBase.h
+++ b/uppsrc/CtrlLib/LabelBase.h
@@ -3,15 +3,6 @@ enum {
 	CTRL_CHECKED, CTRL_HOTCHECKED
 };
 
-struct CtrlsImgLook : Vector<Value> { // deprecated - remove after refactoring chameleon
-	CtrlsImgLook& operator()(int i, int n = 4);
-	CtrlsImgLook& operator()(int i, const Image& img, Color (*fn)(int i), int n = 4);
-	CtrlsImgLook& operator()(int i, const Image& img, int n = 4);
-	CtrlsImgLook(int i, int n = 4);
-	CtrlsImgLook(int i, const Image& img, Color (*fn)(int i), int n = 4);
-	CtrlsImgLook(int i, const Image& img, int n = 4);
-};
-
 void CtrlsImageLook(Value *look, int i, int n = 4);
 void CtrlsImageLook(Value *look, int i, const Image& image, const Color *color, int n = 4);
 void CtrlsImageLook(Value *look, int i, const Image& image, int n = 4);