set eol-style

[wxWidgets.git] / include / wx / gtk / colour.h

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 25ef5e9d8252b0677cbc2e23a0e1fb66543b3203..88ac82e6882359572f53bdee086d50ac3ca55e54 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -25,9 +25,10 @@ public:
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
     wxColour(const GdkColor& gdkColor);
 
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
     wxColour(const GdkColor& gdkColor);
 

-    ~wxColour();
+    virtual ~wxColour();

 
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }


@@ -35,6 +36,7 @@ public:
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;

+    unsigned char Alpha() const;

 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );


@@ -48,8 +50,10 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-    virtual bool FromString(const wxChar *str);
-    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+
+    virtual bool FromString(const wxString& str);

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