X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index f9d2fa62a2..13f981ebf2 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -15,7 +15,7 @@ #include "wx/gdicmn.h" -#ifdef USE_GDK_IMLIB +#ifdef wxUSE_GDK_IMLIB #include "../gdk_imlib/gdk_imlib.h" #endif @@ -165,25 +165,40 @@ void wxColour::Set( const unsigned char red, const unsigned char green, const un unsigned char wxColour::Red(void) const { - if (!Ok()) return 0; + if (!Ok()) + { + wxFAIL_MSG( "invalid colour" ); + return 0; + } + return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); } unsigned char wxColour::Green(void) const { - if (!Ok()) return 0; + if (!Ok()) + { + wxFAIL_MSG( "invalid colour" ); + return 0; + } + return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); } unsigned char wxColour::Blue(void) const { - if (!Ok()) return 0; + if (!Ok()) + { + wxFAIL_MSG( "invalid colour" ); + return 0; + } + return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } bool wxColour::Ok(void) const { - return (m_refData); + return (m_refData != NULL); } void wxColour::CalcPixel( GdkColormap *cmap ) @@ -193,7 +208,7 @@ void wxColour::CalcPixel( GdkColormap *cmap ) if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return; M_COLDATA->FreeColour(); -#ifdef USE_GDK_IMLIB +#ifdef wxUSE_GDK_IMLIB int r = M_COLDATA->m_color.red >> SHIFT; int g = M_COLDATA->m_color.green >> SHIFT;