First stab at wxColour using NSColor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index e7a64f7c2b97dab584db0d9da849751a949b9d32..d0eb9d14f3dc5d6fcd8b00200a0702631849cb36 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -1,103 +1,95 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h
 // Purpose:     wxColour class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h
 // Purpose:     wxColour class

-// Author:      AUTHOR
+// Author:      David Elliott

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     2003/06/17

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) 2003 David Elliott

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 
 #include "wx/object.h"
 #include "wx/string.h"
 

-// Colour
+// ========================================================================
+// wxColour
+// ========================================================================

 class WXDLLEXPORT wxColour: public wxObject
 {
 public:
 class WXDLLEXPORT wxColour: public wxObject
 {
 public:

-  // ctors
-    // default
-  wxColour();
+    DECLARE_DYNAMIC_CLASS(wxColour)
+// ------------------------------------------------------------------------
+// initialization
+// ------------------------------------------------------------------------
+    wxColour();

     // from RGB
     // 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); }
+    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
   
     // 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); }
+    wxColour( const wxString &colourName )
+    :   m_cocoaNSColor(NULL)
+    {   InitFromName(colourName); }
+    wxColour( const char *colourName )
+    :   m_cocoaNSColor(NULL)
+    {   InitFromName(wxString::FromAscii(colourName)); }

 
     // copy ctors and assignment operators
 
     // 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));
-  }
+    wxColour( const wxColour& col );
+    wxColour& operator = ( const wxColour& col );

 
 

-  // accessors
-  bool Ok() const {return m_isInit; }
+    ~wxColour();

 
 

-  // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-  void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
+// ------------------------------------------------------------------------
+// Implementation
+// ------------------------------------------------------------------------
+    // accessors
+    bool Ok() 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 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 &&
+    // 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_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);
+    }
+    bool operator != (const wxColour& colour) const
+    {   return !(*this == colour); }

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

-private:
-  bool          m_isInit;
-  unsigned char m_red;
-  unsigned char m_blue;
-  unsigned char m_green;
+    // 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));
+    }

 
 

-public:
-//  WXCOLORREF m_pixel ;
-//  void Set( const WXCOLORREF* color ) ;
+protected:
+    void InitFromName(const wxString& col);

 
 private:
 
 private:

-  DECLARE_DYNAMIC_CLASS(wxColour)
+    WX_NSColor m_cocoaNSColor;
+    unsigned char m_red;
+    unsigned char m_green;
+    unsigned char m_blue;

 };
 
 };
 

-#endif
-  // _WX_COLOUR_H_
+#endif // __WX_COCOA_COLOUR_H__

diff --git a/src/cocoa/colour.cpp b/src/cocoa/colour.cpp
deleted file mode 100644 (file)
index 8d0827e..0000000
--- a/src/cocoa/colour.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        colour.cpp
-// Purpose:     wxColour class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "colour.h"
-#endif
-
-#include "wx/gdicmn.h"
-#include "wx/colour.h"
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
-
-// Colour
-
-wxColour::wxColour ()
-{
-    m_isInit = FALSE;
-    m_red = m_blue = m_green = 0;
-/* TODO
-    m_pixel = 0;
-*/
-}
-
-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
-{
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
-}
-
-wxColour::wxColour (const wxColour& col)
-{
-    m_red = col.m_red;
-    m_green = col.m_green;
-    m_blue = col.m_blue;
-    m_isInit = col.m_isInit;
-/* TODO
-    m_pixel = col.m_pixel;
-*/
-}
-
-wxColour& wxColour::operator =(const wxColour& col)
-{
-  m_red = col.m_red;
-  m_green = col.m_green;
-  m_blue = col.m_blue;
-  m_isInit = col.m_isInit;
-/* TODO
-  m_pixel = col.m_pixel;
-*/
-  return *this;
-}
-
-void wxColour::InitFromName(const wxString& col)
-{
-    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-    if (the_colour)
-    {
-        m_red = the_colour->Red ();
-        m_green = the_colour->Green ();
-        m_blue = the_colour->Blue ();
-        m_isInit = TRUE;
-    }
-    else
-    {
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
-        m_isInit = FALSE;
-    }
-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
-}
-
-wxColour::~wxColour ()
-{
-}
-
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
-{
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
-}

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
new file mode 100644 (file)
index 0000000..b755914
--- /dev/null
+++ b/src/cocoa/colour.mm
@@ -0,0 +1,74 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        colour.mm
+// Purpose:     wxColour class
+// Author:      David Elliott
+// Modified by:
+// Created:     2003/06/17
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 David Elliott
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#import <AppKit/NSColor.h>
+
+#include "wx/gdicmn.h"
+#include "wx/colour.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+
+wxColour::wxColour ()
+:   m_cocoaNSColor(NULL)
+{
+    m_red = m_blue = m_green = 0;
+}
+
+wxColour::wxColour (const wxColour& col)
+:   m_cocoaNSColor(col.m_cocoaNSColor)
+,   m_red(col.m_red)
+,   m_green(col.m_green)
+,   m_blue(col.m_blue)
+{
+    [m_cocoaNSColor retain];
+}
+
+wxColour& wxColour::operator =(const wxColour& col)
+{
+    m_cocoaNSColor = col.m_cocoaNSColor;
+    m_red = col.m_red;
+    m_green = col.m_green;
+    m_blue = col.m_blue;
+    [m_cocoaNSColor retain];
+    return *this;
+}
+
+void wxColour::InitFromName(const wxString& col)
+{
+    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
+    if (the_colour)
+    {
+        *this = *the_colour;
+    }
+    else
+    {
+        [m_cocoaNSColor release];
+        m_cocoaNSColor = NULL;
+        m_red = 0;
+        m_green = 0;
+        m_blue = 0;
+    }
+}
+
+wxColour::~wxColour ()
+{
+    [m_cocoaNSColor release];
+}
+
+void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+{
+    [m_cocoaNSColor release];
+    m_cocoaNSColor = [[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] retain];
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+}
+