added the static function GetLabelText() to wxStaticText which was mentioned in the...

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 12a65e02a53125240a4c8d68cc0c943447bcfd82..d752b70530579cb57e3fe62123e151a8de88f3dd 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -1,129 +1,81 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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/colour.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-// Colour
-

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

-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;
-}
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

 
 

-wxColour::wxColour ()
+wxColour::wxColour(const RGBColor& col)

 {
 {

-    m_isInit = FALSE;
-    m_red = m_blue = m_green = 0;
-    
-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    FromRGBColor((WXCOLORREF *)&col);

 }
 
 }
 

-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )

 {
 {

-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-
-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    RGBColor* col = (RGBColor*) color;
+    col->red = (red << 8) + red;
+    col->blue = (blue << 8) + blue;
+    col->green = (green << 8) + green;

 }
 
 }
 

-wxColour::wxColour (const wxColour& col)
-    : wxObject()
+void wxColour::Init()

 {
 {

-    m_red = col.m_red;
-    m_green = col.m_green;
-    m_blue = col.m_blue;
-    m_isInit = col.m_isInit;
+    m_isInit = false;
+    m_red =
+    m_blue =
+    m_green = 0;

 
 

-    memcpy( &m_pixel , &col.m_pixel , 6 ) ;
+    wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );

 }
 
 }
 

-wxColour::wxColour (const wxColour* col)
+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 ) ;
-    
-    return *this;
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_alpha = a ;
+    m_isInit = true;
+
+    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );

 }
 
 }
 

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

 {
 {

-    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-    if (the_colour)
-    {
-        m_red = the_colour->Red ();
-        m_green = the_colour->Green ();
-        m_blue = the_colour->Blue ();
-        m_isInit = TRUE;
-    }
-    else
-    {
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
-        m_isInit = FALSE;
-    }
-
-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    RGBColor* col = (RGBColor*) color;
+    memcpy( &m_pixel, color, 6 );
+    m_red = col->red >> 8;
+    m_blue = col->blue >> 8;
+    m_green = col->green >> 8;

 }
 
 }
 

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