Fix wxBitmapButton best size calculation in wxOSX/Carbon.

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

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 35114175ceee1b93366d43d71a320b189d8a6999..cb148d9db44ea0761ac460411aa8d29dd7d6f601 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:
@@ -19,8 +19,6 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
 #if wxOSX_USE_COCOA_OR_CARBON
 wxColour::wxColour(const RGBColor& col)
 {
@@ -81,6 +79,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
         CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ;
         col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
     }
+    wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( col );
 }
 
@@ -103,12 +102,14 @@ void wxColour::InitRGBColor( const RGBColor& col )
                                     (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;
         cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
     }
+    wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( cfcol );
 }
 #endif
 
 void wxColour::InitCGColorRef( CGColorRef col )
 {
+    wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( col );
     size_t noComp = CGColorGetNumberOfComponents( col );