removing NSWindow based mouse tracking in favour of 10.5+ trackingArea implementation

[wxWidgets.git] / include / wx / osx / core / colour.h

diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index 388b176f2a70b7b7bc9b9658e2194cf83527e71e..cefae9a881dfc0b3006eeed9efe7bbfee4acf67e 100644 (file)
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/colour.h
+// Name:        wx/osx/core/colour.h

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


@@ -42,10 +42,10 @@ public:
 
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
 
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 

-    CGColorRef GetPixel() const { return m_cgColour; };
+    CGColorRef GetPixel() const { return m_cgColour; }

 
 

-    CGColorRef GetCGColor() const { return m_cgColour; };
-    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); };
+    CGColorRef GetCGColor() const { return m_cgColour; }
+    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }

 
 #if wxOSX_USE_COCOA_OR_CARBON
     void GetRGBColor( RGBColor *col ) const;
 
 #if wxOSX_USE_COCOA_OR_CARBON
     void GetRGBColor( RGBColor *col ) const;


@@ -60,6 +60,7 @@ public:
 #endif
 #if wxOSX_USE_COCOA
     wxColour(WX_NSColor color);
 #endif
 #if wxOSX_USE_COCOA
     wxColour(WX_NSColor color);

+    WX_NSColor OSXGetNSColor() const;

 #endif
     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);
 #endif
     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);