added a wxTreeEvent ctor taking the associated wxTreeCtrl and optional wxTreeItemId...

[wxWidgets.git] / include / wx / cocoa / colour.h

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index 9200c35502de1e401ead3c53994613f49b517e51..db7a4e9444053caeb9a0757657d0e77686d0b997 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/cocoa/colour.h
 // Purpose:     wxColour class
 // Author:      David Elliott
 // Modified by:
@@ -18,30 +18,20 @@
 // ========================================================================
 // wxColour
 // ========================================================================
-class WXDLLEXPORT wxColour: public wxObject
+
+class WXDLLEXPORT wxColour : public wxColourBase
 {
 public:
-    wxColour() { Init(); }
+    // constructors
+    // ------------
 
-    // from RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-    :   m_cocoaNSColor(NULL)
-    {   Set(red,green,blue); }
-    wxColour( unsigned long colRGB )
-    :   m_cocoaNSColor(NULL)
-    {   Set(colRGB); }
+    // default
+    wxColour() { Init(); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // initialization using existing NSColor
     wxColour( WX_NSColor aColor );
 
-    // implicit conversion from the colour name
-    wxColour( const wxString &colourName )
-    {   InitFromName(colourName); }
-    wxColour( const char *colourName )
-    {   InitFromName(wxString::FromAscii(colourName)); }
-#if wxUSE_UNICODE
-    wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
-#endif
 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
@@ -70,23 +60,13 @@ public:
     {   return !(*this == colour); }
 
     // Set() functions
-    void Set( unsigned char red, unsigned char green, unsigned char blue );
-    void Set( unsigned long colRGB )
-    {
-        // we don't need to know sizeof(long) here because we assume that the three
-        // least significant bytes contain the R, G and B values
-        Set((unsigned char)colRGB,
-            (unsigned char)(colRGB >> 8),
-            (unsigned char)(colRGB >> 16));
-    }
     void Set( WX_NSColor aColor );
 
 protected:
     // puts the object in an invalid, uninitialized state
     void Init();
 
-    // create the object from name, leaves it uninitialized if it failed
-    void InitFromName(const wxString& col);
+    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
 
 private:
     WX_NSColor m_cocoaNSColor;