fix a few hundreds of harmless unused parameters warnings and a couple of real bugs...

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index f0ba1ee902391f5e81dc884e828397c17628ee33..4af845a7e445e3e7c4e8a478b6a23bf47d77a07f 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -1,33 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colour.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/gdicmn.h"

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

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
-// Colour
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif

 
 #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)
+
+wxColour::wxColour(const RGBColor& col)
+{
+    FromRGBColor((WXCOLORREF *)&col);
+}
+

 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,67 +41,42 @@ void wxColour::Init()
     m_blue =
     m_green = 0;
 
     m_blue =
     m_green = 0;
 

-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );

 }
 
 }
 

-wxColour::wxColour (const wxColour& col)
-    : wxObject()
+wxColour::~wxColour ()

 {
 {

-    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)
+void wxColour::InitRGBA (unsigned char r, unsigned char g, unsigned char b, unsigned char a)

 {
 {

-    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 ) ;
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_alpha = a ;
+    m_isInit = true;

 
 

-    return *this;
+    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );

 }
 
 }
 

-void wxColour::InitFromName(const wxString& name)
+void wxColour::FromRGBColor( WXCOLORREF* color )

 {
 {

-    if ( wxTheColourDatabase )
-    {
-        wxColour col = wxTheColourDatabase->Find(name);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
-    }
-
-    // leave invalid
-    Init();
+    RGBColor* col = (RGBColor*) color;
+    memcpy( &m_pixel, color, 6 );
+    m_red = col->red >> 8;
+    m_blue = col->blue >> 8;
+    m_green = col->green >> 8;
+    m_alpha = 255;

 }
 
 }
 

-wxColour::~wxColour ()
+wxColour& wxColour::operator=(const RGBColor& col)

 {
 {

+    FromRGBColor((WXCOLORREF *)&col);
+    return *this;

 }
 
 }
 

-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+bool wxColour::IsOk() const 

 {
 {

-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = true;
-
-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    return m_isInit; 

 }
 
 }
 

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