Fixed a confusion between window and client size that could lead to

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index cc549b5f1144e11e602a5fad4b94f8132ab95a14..6a3562c3d43f2f33cff8fd3166bb6e9eac853559 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -1,116 +1,71 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxColour class
 // Purpose:     wxColour class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// 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
-
-static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green ) ;
-static void wxComposeRGBColor( RGBColor * col , int red, int blue, int 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;
+#include "wx/mac/private.h"

 
 

-       wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
-}
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

 
 

-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green );
+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)
+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;

 
 

-    m_pixel = col.m_pixel;
+    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;
-
-    m_pixel = col->m_pixel;

 }
 
 }
 

-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;
- 
-  m_pixel = col.m_pixel;
+    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& 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 ()
+bool wxColour::IsOk() const 

 {
 {

+    return m_isInit; 

 }
 
 }
 

-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
-{
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-
-       wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
-}