Removed no longer needed "DECLARE_EVENT_TABLE()" completing the previous change.

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

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index 694e870b733c3246f3bac20f11da6da49c10311c..f0e3829a73ddfc03f8008ae074c191ca13dc756c 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:
 // Purpose:     wxColour class
 // Author:      David Elliott
 // Modified by:


@@ -18,42 +18,30 @@
 // ========================================================================
 // wxColour
 // ========================================================================
 // ========================================================================
 // wxColour
 // ========================================================================

-class WXDLLEXPORT wxColour: public wxObject
+
+class WXDLLEXPORT wxColour : public wxColourBase

 {
 public:
 {
 public:

-    DECLARE_DYNAMIC_CLASS(wxColour)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-    wxColour();
-    // 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); }
-
-    // implicit conversion from the colour name
-    wxColour( const wxString &colourName )
-    :   m_cocoaNSColor(NULL)
-    {   InitFromName(colourName); }
-    wxColour( const char *colourName )
-    :   m_cocoaNSColor(NULL)
-    {   InitFromName(wxString::FromAscii(colourName)); }
+    // constructors
+    // ------------
+
+    // default
+    wxColour() { Init(); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
+    // initialization using existing NSColor
+    wxColour( WX_NSColor aColor );
+

 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
     wxColour& operator = ( const wxColour& col );
 
 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
     wxColour& operator = ( const wxColour& col );
 

-    ~wxColour();
+    virtual ~wxColour();

 
 

-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------

     // accessors
     bool Ok() const { return m_cocoaNSColor; }
     // accessors
     bool Ok() const { return m_cocoaNSColor; }

-    inline WX_NSColor GetNSColor() { return m_cocoaNSColor; }
+    WX_NSColor GetNSColor() { return m_cocoaNSColor; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }


@@ -62,34 +50,45 @@ public:
     // comparison
     bool operator == (const wxColour& colour) const
     {
     // comparison
     bool operator == (const wxColour& colour) const
     {

+        // TODO: Really compare the NSColor

         return (m_cocoaNSColor == colour.m_cocoaNSColor
         return (m_cocoaNSColor == colour.m_cocoaNSColor

-            && m_red == colour.m_red
+            || (m_red == colour.m_red

             && m_green == colour.m_green
             && m_green == colour.m_green

-            && m_blue == colour.m_blue);
+            && m_blue == colour.m_blue));

     }
     bool operator != (const wxColour& colour) const
     {   return !(*this == colour); }
 
     }
     bool operator != (const wxColour& colour) const
     {   return !(*this == colour); }
 

-//  const WXCOLORREF& GetPixel() const { return m_pixel; };
-

     // Set() functions
     // 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 );
+    
+    // reroute the inherited ones
+    void Set(unsigned char red, unsigned char green, unsigned char blue)
+    { wxColourBase::Set(red,green,blue); }
+    
+    // implemented in colourcmn.cpp
+    bool Set(const wxChar *str)
+    { return wxColourBase::Set(str); }
+    
+    bool Set(const wxString &str)
+    { return wxColourBase::Set(str); }
+    
+    void Set(unsigned long colRGB)
+    { wxColourBase::Set(colRGB); }
+    
+protected:
+    // puts the object in an invalid, uninitialized state
+    void Init();

 
 

-    void InitFromName(const wxString& col);
+    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );

 
 private:
     WX_NSColor m_cocoaNSColor;
     unsigned char m_red;
     unsigned char m_green;
     unsigned char m_blue;
 
 private:
     WX_NSColor m_cocoaNSColor;
     unsigned char m_red;
     unsigned char m_green;
     unsigned char m_blue;

+
+    DECLARE_DYNAMIC_CLASS(wxColour)

 };
 
 #endif // __WX_COCOA_COLOUR_H__
 };
 
 #endif // __WX_COCOA_COLOUR_H__