X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff7b1510ea7f7855091df83d75a44415dc1cba18..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/colour.cpp

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index f66321773e..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
 
@@ -44,7 +44,7 @@ wxColourRefData::wxColourRefData(void)
   m_color.green = 0;
   m_color.blue = 0;
   m_color.pixel = 0;
-  m_colormap = NULL;
+  m_colormap = (GdkColormap *) NULL;
   m_hasPixel = FALSE;
 }
 
@@ -81,7 +81,7 @@ wxColour::wxColour( char red, char green, char blue )
   
 wxColour::wxColour( const wxString &colourName )
 {
-  wxNode *node = NULL;
+  wxNode *node = (wxNode *) NULL;
   if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) 
   {
     wxColour *col = (wxColour*)node->Data();
@@ -95,7 +95,7 @@ wxColour::wxColour( const wxString &colourName )
     {
       wxFAIL_MSG( "wxColour: couldn't find colour" );
       delete m_refData;
-      m_refData = NULL;
+      m_refData = (wxObjectRefData *) NULL;
     }
   }
 }
@@ -124,7 +124,7 @@ wxColour& wxColour::operator = ( const wxColour& col )
 wxColour& wxColour::operator = ( const wxString& colourName ) 
 { 
   UnRef();
-  wxNode *node = NULL;
+  wxNode *node = (wxNode *) NULL;
   if ((wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) 
   {
     wxColour *col = (wxColour*)node->Data();
@@ -137,7 +137,7 @@ wxColour& wxColour::operator = ( const wxString& colourName )
     {
       wxFAIL_MSG( "wxColour: couldn't find colour" );
       delete m_refData;
-      m_refData = NULL;
+      m_refData = (wxObjectRefData *) NULL;
     }
   }
   return *this; 
@@ -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;
@@ -219,7 +234,7 @@ int wxColour::GetPixel(void)
 
 GdkColor *wxColour::GetColor(void)
 {
-  if (!Ok()) return NULL;
+  if (!Ok()) return (GdkColor *) NULL;
   
   return &M_COLDATA->m_color;
 }