X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a24aff654fb10971e82abccc1b56217d556d447b..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/cocoa/colour.h?ds=sidebyside

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index e7a64f7c2b..3209d94f0c 100644
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -1,103 +1,93 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/cocoa/colour.h
 // Purpose:     wxColour class
-// Author:      AUTHOR
+// Author:      David Elliott
 // Modified by:
-// Created:     ??/??/98
+// Created:     2003/06/17
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_COLOUR_H_
-#define _WX_COLOUR_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "colour.h"
-#endif
+#ifndef __WX_COCOA_COLOUR_H__
+#define __WX_COCOA_COLOUR_H__
 
 #include "wx/object.h"
 #include "wx/string.h"
 
-// Colour
-class WXDLLEXPORT wxColour: public wxObject
+// ========================================================================
+// wxColour
+// ========================================================================
+
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
 public:
-  // ctors
-    // default
-  wxColour();
-    // from RGB
-  wxColour( unsigned char red, unsigned char green, unsigned char blue );
-  wxColour( unsigned long colRGB )
-      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
-      { Set(colRGB); }
-  
-    // implicit conversion from the colour name
-  wxColour( const wxString &colourName )
-      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
-      { InitFromName(colourName); }
-  wxColour( const char *colourName )
-      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
-      { InitFromName(colourName); }
+    // constructors
+    // ------------
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
+    // initialization using existing NSColor
+    wxColour( WX_NSColor aColor );
 
     // copy ctors and assignment operators
-  wxColour( const wxColour& col );
-  wxColour( const wxColour* col );
-  wxColour& operator = ( const wxColour& col );
-
-    // dtor
-  ~wxColour();
-
-  // 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));
-  }
-
-  // accessors
-  bool Ok() const {return m_isInit; }
-
-  // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-  void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
-
-  unsigned char Red() const { return m_red; }
-  unsigned char Green() const { return m_green; }
-  unsigned char Blue() const { return m_blue; }
-
-  // comparison
-  bool operator == (const wxColour& colour) const
-  {
-    return (m_isInit == colour.m_isInit &&
-            m_red == colour.m_red && 
-            m_green == colour.m_green && 
-            m_blue == colour.m_blue);
-  }
-  bool operator != (const wxColour& colour) const { return !(*this == colour); }
-
-  void InitFromName(const wxString& col);
-
-//  const WXCOLORREF& GetPixel() const { return m_pixel; };
+    wxColour( const wxColour& col );
+    wxColour& operator = ( const wxColour& col );
+
+    virtual ~wxColour();
+
+    // accessors
+    virtual bool IsOk() const { return m_cocoaNSColor; }
+    WX_NSColor GetNSColor() { return m_cocoaNSColor; }
+    WX_NSColor GetNSColor() const { return m_cocoaNSColor; }
+
+    unsigned char Red() const { return m_red; }
+    unsigned char Green() const { return m_green; }
+    unsigned char Blue() const { return m_blue; }
+    unsigned char Alpha() const { return m_alpha; }
+
+    // comparison
+    bool operator == (const wxColour& colour) const
+    {
+        return m_cocoaNSColor == colour.m_cocoaNSColor ||
+               (m_red == colour.m_red &&
+                m_green == colour.m_green &&
+                m_blue == colour.m_blue &&
+                m_alpha == colour.m_alpha);
+    }
+    bool operator != (const wxColour& colour) const
+        { return !(*this == colour); }
+
+    // Set() functions
+    void Set( WX_NSColor aColor );
+
+    // reroute the inherited ones
+    void Set(unsigned char red,
+             unsigned char green,
+             unsigned char blue,
+             unsigned char alpha = wxALPHA_OPAQUE)
+        { wxColourBase::Set(red, green, blue, alpha); }
+
+    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();
+
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 private:
-  bool          m_isInit;
-  unsigned char m_red;
-  unsigned char m_blue;
-  unsigned char m_green;
+    WX_NSColor m_cocoaNSColor;
+    unsigned char m_red;
+    unsigned char m_green;
+    unsigned char m_blue;
+    unsigned char m_alpha;
 
-public:
-//  WXCOLORREF m_pixel ;
-//  void Set( const WXCOLORREF* color ) ;
-
-private:
-  DECLARE_DYNAMIC_CLASS(wxColour)
+    DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
-#endif
-  // _WX_COLOUR_H_
+#endif // __WX_COCOA_COLOUR_H__