Version 0.4 of wxPython for MSW.

[wxWidgets.git] / src / gtk1 / colour.cpp

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index ba970a79ba5323139b32ea9dbd9fd6599a394cd4..13f981ebf2c7bd7f97fe8b55b6ec289d06b46d20 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -15,8 +15,8 @@
 
 #include "wx/gdicmn.h"
 
-#ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#ifdef wxUSE_GDK_IMLIB
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -44,19 +44,19 @@ 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;
-};
+}
 
 wxColourRefData::~wxColourRefData(void)
 {
   FreeColour();
-};
+}
 
 void wxColourRefData::FreeColour(void)
 {
 //  if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 );
-};
+}
 
 //-----------------------------------------------------------------------------
 
@@ -68,7 +68,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
 wxColour::wxColour(void)
 {
-};
+}
 
 wxColour::wxColour( char red, char green, char blue )
 {
@@ -77,11 +77,11 @@ wxColour::wxColour( char red, char green, char blue )
   M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
   M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
   M_COLDATA->m_color.pixel = 0;
-};
+}
   
 wxColour::wxColour( const wxString &colourName )
 {
-  wxNode *node = NULL;
+  wxNode *node = (wxNode *) NULL;
   if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) 
   {
     wxColour *col = (wxColour*)node->Data();
@@ -93,37 +93,38 @@ wxColour::wxColour( const wxString &colourName )
     m_refData = new wxColourRefData();
     if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
     {
+      wxFAIL_MSG( "wxColour: couldn't find colour" );
       delete m_refData;
-      m_refData = NULL;
-    };
-  };
-};
+      m_refData = (wxObjectRefData *) NULL;
+    }
+  }
+}
 
 wxColour::wxColour( const wxColour& col )
 { 
   Ref( col ); 
-};
+}
 
 wxColour::wxColour( const wxColour* col ) 
 { 
   if (col) Ref( *col ); 
-};
+}
 
 wxColour::~wxColour(void)
 {
-};
+}
 
 wxColour& wxColour::operator = ( const wxColour& col ) 
 { 
   if (*this == col) return (*this); 
   Ref( col ); 
   return *this; 
-};
+}
 
 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();
@@ -134,22 +135,23 @@ wxColour& wxColour::operator = ( const wxString& colourName )
     m_refData = new wxColourRefData();
     if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
     {
+      wxFAIL_MSG( "wxColour: couldn't find colour" );
       delete m_refData;
-      m_refData = NULL;
-    };
-  };
+      m_refData = (wxObjectRefData *) NULL;
+    }
+  }
   return *this; 
-};
+}
 
 bool wxColour::operator == ( const wxColour& col ) 
 { 
   return m_refData == col.m_refData; 
-};
+}
 
 bool wxColour::operator != ( const wxColour& col) 
 { 
   return m_refData != col.m_refData; 
-};
+}
 
 void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue )
 {
@@ -159,30 +161,45 @@ void wxColour::Set( const unsigned char red, const unsigned char green, const un
   M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
   M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
   M_COLDATA->m_color.pixel = 0;
-};
+}
 
 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 )
 {
@@ -191,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;
@@ -206,20 +223,20 @@ void wxColour::CalcPixel( GdkColormap *cmap )
 #endif
   
   M_COLDATA->m_colormap = cmap;
-};
+}
 
 int wxColour::GetPixel(void)
 {
   if (!Ok()) return 0;
   
   return M_COLDATA->m_color.pixel;
-};
+}
 
 GdkColor *wxColour::GetColor(void)
 {
-  if (!Ok()) return NULL;
+  if (!Ok()) return (GdkColor *) NULL;
   
   return &M_COLDATA->m_color;
-};
+}