adding measuring contexts, streamlining printing code

[wxWidgets.git] / include / wx / mac / carbon / colour.h

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index bc015e9ecdf125b5e2a1764d5d52443c752b974e..05fa12dc8fd9b539991f79ea9fad49a8dfa77abf 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -16,7 +16,7 @@
 #include "wx/string.h"
 
 // Colour
 #include "wx/string.h"
 
 // Colour

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

 {
 public:
     // constructors
 {
 public:
     // constructors


@@ -24,41 +24,19 @@ public:
 
     // default
     wxColour() { Init(); }
 
     // default
     wxColour() { Init(); }

-
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-        { Set(red, green, blue); }
-
-    // from packed RGB
-    wxColour( unsigned long colRGB )
-        { Set(colRGB); }
-
-    // implicit conversion from the colour name
-    wxColour( const wxString &colourName )
-        { InitFromName(colourName); }
-    wxColour( const wxChar *colourName )
-        { InitFromName(colourName); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS

 
     // dtor
 
     // 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));
-    }
+    virtual ~wxColour();

 
     // accessors
 
     // accessors

-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const {return m_isInit; }

 
     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; }

+    unsigned char Alpha() const { return m_alpha; }

 
     // comparison
     bool operator == (const wxColour& colour) const
 
     // comparison
     bool operator == (const wxColour& colour) const


@@ -66,28 +44,32 @@ public:
         return (m_isInit == colour.m_isInit
                 && m_red == colour.m_red
                 && m_green == colour.m_green
         return (m_isInit == colour.m_isInit
                 && m_red == colour.m_red
                 && m_green == colour.m_green

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

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

-    void InitFromName(const wxString& col);
-

 protected :
 
     // Helper function
     void Init();
 
 protected :
 
     // Helper function
     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;
 private:
     bool          m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;

+    unsigned char m_alpha;

 
 public:
     WXCOLORREF m_pixel ;
 
 public:
     WXCOLORREF m_pixel ;

-    void Set( const WXCOLORREF* color ) ;
+    void FromRGBColor( const WXCOLORREF* color ) ;
+

 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)