destroy m_impl even if an exception is thrown from the main loop

[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 05fa12dc8fd9b539991f79ea9fad49a8dfa77abf..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"
 
+struct RGBColor;
+
 // Colour
 class WXDLLEXPORT wxColour: public wxColourBase
 {
@@ -31,7 +33,7 @@ public:
 
     // accessors
     bool Ok() const { return IsOk(); }
-    bool IsOk() const {return m_isInit; }
+    bool IsOk() const;
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
@@ -51,6 +53,10 @@ public:
 
     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
@@ -68,7 +74,7 @@ private:
 
 public:
     WXCOLORREF m_pixel ;
-    void FromRGBColor( const WXCOLORREF* color ) ;
+    void FromRGBColor( WXCOLORREF* color ) ;
 
 
 private: