From d0f51114ce60cde1ba6bb8e4dba99cc44dfb2b76 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 17 Apr 2011 20:05:20 +0000
Subject: [PATCH] CtrlLib: DropList now displays readonly values as
 SColorDisabled

git-svn-id: svn://ultimatepp.org/upp/trunk@3350 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/MultiButton.cpp | 2 +-
 uppsrc/Draw/ImageOp.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/uppsrc/CtrlLib/MultiButton.cpp b/uppsrc/CtrlLib/MultiButton.cpp
index e1042030b..299c74313 100644
--- a/uppsrc/CtrlLib/MultiButton.cpp
+++ b/uppsrc/CtrlLib/MultiButton.cpp
@@ -446,7 +446,7 @@ void MultiButton::Paint(Draw& w)
 	if(cr.left < cr.right && display) {
 		w.Clip(clr);
 		display->Paint(w, cr, v,
-		               IsShowEnabled() ? text : SColorDisabled,
+		               IsShowEnabled() && IsEditable() ? text : SColorDisabled,
 		               paper, f ? Display::CURSOR : Display::FOCUS|Display::CURSOR);
 		w.End();
 	}
diff --git a/uppsrc/Draw/ImageOp.cpp b/uppsrc/Draw/ImageOp.cpp
index c564c4488..27175a19f 100644
--- a/uppsrc/Draw/ImageOp.cpp
+++ b/uppsrc/Draw/ImageOp.cpp
@@ -138,7 +138,7 @@ Image ColorMask(const Image& src, Color key)
 			*t++ = *s;
 		s++;
 	}
-	ib.SetHotSpots(src;
+	ib.SetHotSpots(src);
 	return ib;
 }