Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 68abfa77bd2bec2d26134546ad9cbb0a76007813..82fb8a7928c521e24d62ab46c81fcbd5ea210cbe 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -16,13 +16,18 @@
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

+#endif

 
 // Colour
 
 
 // Colour
 

-static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green ) ;
-static void wxComposeRGBColor( RGBColor * col , 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 ) 

 {
 {

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


@@ -53,7 +58,7 @@ wxColour::wxColour (const wxColour& col)
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;
 
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;
 

-    m_pixel = col.m_pixel;
+    memcpy( &m_pixel , &col.m_pixel , 6 ) ;

 }
 
 wxColour::wxColour (const wxColour* col)
 }
 
 wxColour::wxColour (const wxColour* col)


@@ -63,7 +68,7 @@ wxColour::wxColour (const wxColour* col)
     m_blue = col->m_blue;
     m_isInit = col->m_isInit;
 
     m_blue = col->m_blue;
     m_isInit = col->m_isInit;
 

-    m_pixel = col->m_pixel;
+    memcpy( &m_pixel , &col->m_pixel , 6 ) ;

 }
 
 wxColour& wxColour::operator =(const wxColour& col)
 }
 
 wxColour& wxColour::operator =(const wxColour& col)


@@ -73,7 +78,7 @@ wxColour& wxColour::operator =(const wxColour& col)
   m_blue = col.m_blue;
   m_isInit = col.m_isInit;
  
   m_blue = col.m_blue;
   m_isInit = col.m_isInit;
  

-  m_pixel = col.m_pixel;
+  memcpy( &m_pixel , &col.m_pixel , 6 ) ;

 
   return *this;
 }
 
   return *this;
 }


@@ -112,3 +117,12 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
 
        wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
        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 ;
+    m_blue = col->blue>>8 ;
+    m_green = col->green>>8 ;
+}
\ No newline at end of file