return false if we cant parse nor allocate color string
fluxgen fluxgen
1 files changed,
7 insertions(+),
3 deletions(-)
jump to
M
src/FbTk/Color.cc
→
src/FbTk/Color.cc
@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Color.cc,v 1.1 2002/11/26 16:01:27 fluxgen Exp $ +// $Id: Color.cc,v 1.2 2002/11/28 19:22:40 fluxgen Exp $ #include "Color.hh"@@ -39,6 +39,7 @@
}; namespace FbTk { + Color::Color(): m_allocated(false), m_screen(0) {@@ -78,10 +79,13 @@ Colormap colm = DefaultColormap(disp, screen);
XColor color; - if (! XParseColor(disp, colm, color_string, &color)) + if (! XParseColor(disp, colm, color_string, &color)) { cerr<<"FbTk::Color: Parse color error: \""<<color_string<<"\""<<endl; - else if (! XAllocColor(disp, colm, &color)) + return false; + } else if (! XAllocColor(disp, colm, &color)) { cerr<<"FbTk::Color: Allocation error: \""<<color_string<<"\""<<endl; + return false; + }