(blind) compilation fixes after latest changes

[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 c2a5db906b62cb537e57c1529e4215f1aaa04e4b..b024afe21814c48774b7a2a5780d2b27d95b551d 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.h
+// Name:        wx/mac/carbon/colour.h

 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,88 +12,73 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colour.h"
-#endif
-

 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"
 

+struct RGBColor;
+

 // Colour
 // Colour

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

 {
 public:
 {
 public:

-  // ctors
+    // constructors
+    // ------------
+

     // default
     // default

-  wxColour() { Init(); }
-    // from RGB
-  wxColour( unsigned char red, unsigned char green, unsigned char blue )
-      { Set(red, green, blue); }
-  wxColour( unsigned long colRGB )
-      { Set(colRGB); }
-
-    // implicit conversion from the colour name
-  wxColour( const wxString &colourName )
-      { InitFromName(colourName); }
-  wxColour( const wxChar *colourName )
-      { InitFromName(colourName); }
-
-    // copy ctors and assignment operators
-  wxColour( const wxColour& col );
-  wxColour& operator = ( const wxColour& col );
+    wxColour() { Init(); }
+    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));
-  }
-
-  // accessors
-  bool Ok() 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; }
-
-  // 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); }
-
-  const WXCOLORREF& GetPixel() const { return m_pixel; };
-
-    void InitFromName(const wxString& col);
+    virtual ~wxColour();
+
+    // accessors
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+
+    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_isInit == colour.m_isInit
+                && 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); }
+
+    const WXCOLORREF& GetPixel() const { return m_pixel; };
+
+    // Mac-specific ctor and assignment operator from the native colour
+    wxColour(const RGBColor& col);
+    wxColour& operator=(const RGBColor& 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:
 private:

-  bool          m_isInit;
-  unsigned char m_red;
-  unsigned char m_blue;
-  unsigned char m_green;
+    bool          m_isInit;
+    unsigned char m_red;
+    unsigned char m_blue;
+    unsigned char m_green;
+    unsigned char m_alpha;

 
 public:
 
 public:

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

 
 private:
 
 private:

-  DECLARE_DYNAMIC_CLASS(wxColour)
+    DECLARE_DYNAMIC_CLASS(wxColour)

 };
 
 #endif
 };
 
 #endif