Added sort order and alignement for column headers.

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 25ef5e9d8252b0677cbc2e23a0e1fb66543b3203..25f0d58caf960d1689b1cfaf164ec4f3d156c7e2 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -25,7 +25,7 @@ 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 m_refData != NULL; }
 


@@ -35,6 +35,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 +49,10 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+

     virtual bool FromString(const wxChar *str);
     virtual bool FromString(const wxChar *str);

-    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );

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