cleanup in toplevel activation, and switching to native carbon event notification...

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 12a65e02a53125240a4c8d68cc0c943447bcfd82..86487f7a35f68fed6fd8a54b8cbc4ee74bf2e62a 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -25,7 +25,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #include "wx/mac/private.h"
 
 static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) ;
 #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 ) 
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )

 {
     RGBColor* col = (RGBColor*) color ;
     col->red = (red << 8) + red;
 {
     RGBColor* col = (RGBColor*) color ;
     col->red = (red << 8) + red;


@@ -33,20 +33,12 @@ static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green
     col->green = (green << 8) + green;
 }
 
     col->green = (green << 8) + green;
 }
 

-wxColour::wxColour ()
+void wxColour::Init()

 {
 {

-    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)
-{
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
+    m_isInit = false;
+    m_red =
+    m_blue =
+    m_green = 0;

 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }


@@ -78,31 +70,26 @@ wxColour& wxColour::operator =(const wxColour& col)
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;

-    
+

     memcpy( &m_pixel , &col.m_pixel , 6 ) ;
     memcpy( &m_pixel , &col.m_pixel , 6 ) ;

-    
+

     return *this;
 }
 
     return *this;
 }
 

-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(const wxString& name)

 {
 {

-    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
+    if ( wxTheColourDatabase )

     {
     {

-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
-        m_isInit = FALSE;
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }

     }
 
     }
 

-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    // leave invalid
+    Init();

 }
 
 wxColour::~wxColour ()
 }
 
 wxColour::~wxColour ()


@@ -114,13 +101,13 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     m_red = r;
     m_green = g;
     m_blue = b;
     m_red = r;
     m_green = g;
     m_blue = b;

-    m_isInit = TRUE;
+    m_isInit = true;

 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
 void wxColour::Set( const WXCOLORREF* color )
 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
 void wxColour::Set( const WXCOLORREF* color )

-{ 
+{

     RGBColor* col = (RGBColor*) color ;
     memcpy( &m_pixel , color , 6 ) ;
     m_red = col->red>>8 ;
     RGBColor* col = (RGBColor*) color ;
     memcpy( &m_pixel , color , 6 ) ;
     m_red = col->red>>8 ;