Make wxPASSWORD and wxPROCESS_ENTER really deprecated.

[wxWidgets.git] / src / mac / carbon / colour.cpp

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 86487f7a35f68fed6fd8a54b8cbc4ee74bf2e62a..864bd6f74983cb75fd30aa7d852b95ebbd7f1303 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -1,33 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/mac/carbon/colour.cpp

 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "colour.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 
 
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
-
-// Colour
-

 #include "wx/mac/private.h"
 
 #include "wx/mac/private.h"
 

-static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) ;
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green );

 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 ;
+    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;


@@ -40,47 +34,14 @@ void wxColour::Init()
     m_blue =
     m_green = 0;
 
     m_blue =
     m_green = 0;
 

-    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;
-    m_blue = col.m_blue;
-    m_isInit = col.m_isInit;
-
-    memcpy( &m_pixel , &col.m_pixel , 6 ) ;
-}
-
-wxColour::wxColour (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 ) ;
-}
-
-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;
+    wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );

 }
 
 void wxColour::InitFromName(const wxString& name)
 {
     if ( wxTheColourDatabase )
     {
 }
 
 void wxColour::InitFromName(const wxString& name)
 {
     if ( wxTheColourDatabase )
     {

-        wxColour col = wxTheColourDatabase->Find(name);
+        wxColour col = wxTheColourDatabase->Find( name );

         if ( col.Ok() )
         {
             *this = col;
         if ( col.Ok() )
         {
             *this = col;


@@ -103,14 +64,14 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     m_blue = b;
     m_isInit = true;
 
     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 )
 {
 }
 
 void wxColour::Set( const WXCOLORREF* color )
 {

-    RGBColor* col = (RGBColor*) color ;
-    memcpy( &m_pixel , color , 6 ) ;
-    m_red = col->red>>8 ;
-    m_blue = col->blue>>8 ;
-    m_green = col->green>>8 ;
+    RGBColor* col = (RGBColor*) color;
+    memcpy( &m_pixel, color, 6 );
+    m_red = col->red >> 8;
+    m_blue = col->blue >> 8;
+    m_green = col->green >> 8;

 }
 }