aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-29 00:58:20 (GMT)
committerfluxgen <fluxgen>2003-08-29 00:58:20 (GMT)
commit8bb23162d465d5b719dc8e18f06d29ae77606260 (patch)
treec0cb23eb05df79348d83045b3ef06148d0ea0324
parentad3a374b584d92c9ddb0002eeee1aa52f80ef0b1 (diff)
downloadfluxbox_paul-8bb23162d465d5b719dc8e18f06d29ae77606260.zip
fluxbox_paul-8bb23162d465d5b719dc8e18f06d29ae77606260.tar.bz2
removed some warning msg
-rw-r--r--src/FbTk/Color.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index d9a9811..5ea6652 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -1,5 +1,5 @@
1// Color.cc for Fluxbox window manager 1// Color.cc for Fluxbox window manager
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen@users.sourceforge.net) 2// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Color.cc,v 1.5 2003/08/11 23:39:28 fluxgen Exp $ 22// $Id: Color.cc,v 1.6 2003/08/29 00:58:20 fluxgen Exp $
23 23
24#include "Color.hh" 24#include "Color.hh"
25 25
@@ -79,15 +79,10 @@ bool Color::setFromString(const char *color_string, int screen) {
79 79
80 XColor color; 80 XColor color;
81 81
82 if (! XParseColor(disp, colm, color_string, &color)) { 82 if (! XParseColor(disp, colm, color_string, &color))
83 cerr<<"FbTk::Color: Parse color error: \""<<color_string<<"\""<<endl;
84 return false; 83 return false;
85 } else if (! XAllocColor(disp, colm, &color)) { 84 else if (! XAllocColor(disp, colm, &color))
86 cerr<<"FbTk::Color: Allocation error: \""<<color_string<<"\""<<endl;
87 return false; 85 return false;
88 }
89
90
91 86
92 setPixel(color.pixel); 87 setPixel(color.pixel);
93 setRGB(maxValue(color.red), 88 setRGB(maxValue(color.red),