Added wxTolBar::etMargins

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index a255c645589cfbbe9394320c5c8a12851730ad81..7059f61441cc43eb6e83dac3274b62657dddcfc7 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -22,19 +22,19 @@
 // Colour
 class WXDLLEXPORT wxColour : public wxObject
 {
 // Colour
 class WXDLLEXPORT wxColour : public wxObject
 {

+DECLARE_DYNAMIC_CLASS(wxColour)

 public:
   // ctors
     // default
   wxColour();
     // from RGB
 public:
   // ctors
     // default
   wxColour();
     // from RGB

-  wxColour( char red, char green, char blue );
+  wxColour( unsigned char red, unsigned char green, unsigned char blue );

     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );
     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );

-  wxColour( const wxColour* col );

   wxColour& operator = ( const wxColour& col );
 
     // dtor
   wxColour& operator = ( const wxColour& col );
 
     // dtor


@@ -53,10 +53,17 @@ public:
 
   // accessors
   bool Ok() const {return m_isInit; }
 
   // 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; };
 
 
   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.
   // 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 +74,8 @@ public:
 
   int AllocColour(WXDisplay* display, bool realloc = FALSE);
 
 
   int AllocColour(WXDisplay* display, bool realloc = FALSE);
 

+  void InitFromName(const wxString& col);
+

 private:
   bool          m_isInit;
   unsigned char m_red;
 private:
   bool          m_isInit;
   unsigned char m_red;