Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / osx / core / colour.cpp

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index e52d5b7aabf133951e038ab56bf82e362a15584d..c30e8bdc6fe2c20b8129ce604a2b6bdedcc44bdb 100644 (file)
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/colour.cpp
+// Name:        src/osx/core/colour.cpp

 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:


@@ -19,8 +19,6 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-

 #if wxOSX_USE_COCOA_OR_CARBON
 wxColour::wxColour(const RGBColor& col)
 {
 #if wxOSX_USE_COCOA_OR_CARBON
 wxColour::wxColour(const RGBColor& col)
 {


@@ -72,7 +70,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     m_alpha = a ;
 
     CGColorRef col = 0 ;
     m_alpha = a ;
 
     CGColorRef col = 0 ;

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#if wxOSX_USE_COCOA_OR_CARBON && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5

     if ( CGColorCreateGenericRGB != NULL )
         col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
     else
     if ( CGColorCreateGenericRGB != NULL )
         col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
     else


@@ -111,7 +109,7 @@ void wxColour::InitCGColorRef( CGColorRef col )
 {
     m_cgColour.reset( col );
     size_t noComp = CGColorGetNumberOfComponents( col );
 {
     m_cgColour.reset( col );
     size_t noComp = CGColorGetNumberOfComponents( col );

-    
+

     const CGFloat *components = NULL;
     if ( noComp >= 1 && noComp <= 4 )
     {
     const CGFloat *components = NULL;
     if ( noComp >= 1 && noComp <= 4 )
     {


@@ -130,7 +128,7 @@ void wxColour::InitFromComponents(const CGFloat* components, size_t numComponent
         m_red = m_green = m_blue = 0;
         return;
     }
         m_red = m_green = m_blue = 0;
         return;
     }

-    
+

     if ( numComponents >= 3 )
     {
         m_red = (int)(components[0]*255+0.5);
     if ( numComponents >= 3 )
     {
         m_red = (int)(components[0]*255+0.5);