(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 54fb53afba96cda533e50d87241c8a9784094ce4..b024afe21814c48774b7a2a5780d2b27d95b551d 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -15,6 +15,8 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"
 

+struct RGBColor;
+

 // Colour
 class WXDLLEXPORT wxColour: public wxColourBase
 {
 // Colour
 class WXDLLEXPORT wxColour: public wxColourBase
 {


@@ -30,7 +32,8 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

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

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


@@ -50,6 +53,10 @@ public:
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 
 
     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
 protected :
 
     // Helper function


@@ -67,7 +74,7 @@ private:
 
 public:
     WXCOLORREF m_pixel ;
 
 public:
     WXCOLORREF m_pixel ;

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

 
 
 private:
 
 
 private: