X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..ac2153a686f20f68038395ab4734161e31eb01c5:/src/mac/carbon/colour.cpp diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index b9a18e9ca9..12a65e02a5 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -6,7 +6,7 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// 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,7 +48,7 @@ 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) @@ -74,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) @@ -102,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 () @@ -116,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 )