* Renamed fstream.h in wfstream.h

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 531d86085f0355a8220d9f3c67d88bbf7b705ead..d9f1711983bf548c2458a1a0a3216e3c79f15e3f 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -22,6 +22,7 @@
 // Colour
 class WXDLLEXPORT wxColour : public wxObject
 {
+DECLARE_DYNAMIC_CLASS(wxColour)
 public:
   // ctors
     // default
@@ -53,10 +54,17 @@ public:
 
   // 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; }
 
   int GetPixel() const { return m_pixel; };
   void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
 
+  inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
+
+  inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
+
   // Allocate a colour, or nearest colour, using the given display.
   // If realloc is TRUE, ignore the existing pixel, otherwise just return
   // the existing one.
@@ -67,6 +75,8 @@ public:
 
   int AllocColour(WXDisplay* display, bool realloc = FALSE);
 
+  void InitFromName(const wxString& col);
+
 private:
   bool          m_isInit;
   unsigned char m_red;