X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6af8d80dcdd9d7ef9cca3aaaaf8fe4db343d7ae..88db66e3734d7dc8bdc965bd03e8512b64b8a48a:/src/gtk1/colour.cpp

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 90bd8e158a..f9d2fa62a2 100644
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -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();
@@ -95,36 +95,36 @@ wxColour::wxColour( const wxString &colourName )
     {
       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();
@@ -137,21 +137,21 @@ 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; 
-};
+}
 
 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 )
 {
@@ -161,30 +161,30 @@ 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;
   return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
-};
+}
 
 unsigned char wxColour::Green(void) const
 {
   if (!Ok()) return 0;
   return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
-};
+}
 
 unsigned char wxColour::Blue(void) const
 {
   if (!Ok()) return 0;
   return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
-};
+}
 
 bool wxColour::Ok(void) const
 {
   return (m_refData);
-};
+}
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
@@ -208,20 +208,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;
-};
+}