From 6d8b1e0656e56946a15574c5f04152f99430ad6b Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Sat, 14 Sep 2002 16:39:16 +0000
Subject: new color handling

---
 src/Theme.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Theme.cc b/src/Theme.cc
index d7d24ed..39a329d 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -41,7 +41,7 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 //  DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.cc,v 1.26 2002/08/24 19:06:06 fluxgen Exp $
+// $Id: Theme.cc,v 1.27 2002/09/14 16:39:16 fluxgen Exp $
 
 #ifndef   _GNU_SOURCE
 #define   _GNU_SOURCE
@@ -851,11 +851,8 @@ bool Theme::readDatabaseColor(char *rname, char *rclass, FbTk::Color *color,
 
 	if (XrmGetResource(m_database, rname, rclass, &value_type,
 			&value)) {
-		m_imagecontrol->parseColor(color, value.addr);
+		color->setFromString(value.addr, m_screennum);
 	} else {
-		// parsing with no color string just deallocates the color, if it has
-		// been previously allocated
-		m_imagecontrol->parseColor(color);
 		color->setPixel(default_pixel);
 		return false; 
 	}
-- 
cgit v0.11.2