X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..46a5010a06b09318878c33a0a6a532f419ea063d:/src/mac/colour.cpp?ds=sidebyside

diff --git a/src/mac/colour.cpp b/src/mac/colour.cpp
index 82fb8a7928..12a65e02a5 100644
--- a/src/mac/colour.cpp
+++ b/src/mac/colour.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.cpp
 // Purpose:     wxColour class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -28,17 +28,17 @@ static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green
 static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) 
 {
     RGBColor* col = (RGBColor*) color ;
-	col->red = (red << 8) + red;
-	col->blue = (blue << 8) + blue;
-	col->green = (green << 8) + green;
+    col->red = (red << 8) + red;
+    col->blue = (blue << 8) + blue;
+    col->green = (green << 8) + green;
 }
 
 wxColour::wxColour ()
 {
-  m_isInit = FALSE;
-  m_red = m_blue = m_green = 0;
-
-	wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    m_isInit = FALSE;
+    m_red = m_blue = m_green = 0;
+    
+    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
 wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
@@ -48,10 +48,11 @@ wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
     m_blue = b;
     m_isInit = TRUE;
 
-	wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
 wxColour::wxColour (const wxColour& col)
+    : wxObject()
 {
     m_red = col.m_red;
     m_green = col.m_green;
@@ -73,14 +74,14 @@ wxColour::wxColour (const wxColour* col)
 
 wxColour& wxColour::operator =(const wxColour& col)
 {
-  m_red = col.m_red;
-  m_green = col.m_green;
-  m_blue = col.m_blue;
-  m_isInit = col.m_isInit;
- 
-  memcpy( &m_pixel , &col.m_pixel , 6 ) ;
-
-  return *this;
+    m_red = col.m_red;
+    m_green = col.m_green;
+    m_blue = col.m_blue;
+    m_isInit = col.m_isInit;
+    
+    memcpy( &m_pixel , &col.m_pixel , 6 ) ;
+    
+    return *this;
 }
 
 void wxColour::InitFromName(const wxString& col)
@@ -101,7 +102,7 @@ void wxColour::InitFromName(const wxString& col)
         m_isInit = FALSE;
     }
 
-	wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
 wxColour::~wxColour ()
@@ -115,7 +116,7 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     m_blue = b;
     m_isInit = TRUE;
 
-	wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
 void wxColour::Set( const WXCOLORREF* color )
@@ -125,4 +126,4 @@ void wxColour::Set( const WXCOLORREF* color )
     m_red = col->red>>8 ;
     m_blue = col->blue>>8 ;
     m_green = col->green>>8 ;
-}
\ No newline at end of file
+}