X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a81a2e96b5a349ee9430b91d36e7e8a21d7976..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/motif/colour.h

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index a255c64558..66adbec41e 100644
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -1,81 +1,76 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/motif/colour.h
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#ifdef __GNUG__
-#pragma interface "colour.h"
-#endif
-
 #include "wx/object.h"
 #include "wx/string.h"
 
 // Colour
-class WXDLLEXPORT wxColour : public wxObject
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
+    DECLARE_DYNAMIC_CLASS(wxColour)
 public:
-  // ctors
-    // default
-  wxColour();
-    // from RGB
-  wxColour( char red, char green, char blue );
-    // implicit conversion from the colour name
-  wxColour( const wxString &colourName ) { InitFromName(colourName); }
-  wxColour( const char *colourName ) { InitFromName(colourName); }
+    // constructors
+    // ------------
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
-  wxColour( const wxColour& col );
-  wxColour( const wxColour* col );
-  wxColour& operator = ( const wxColour& col );
+    wxColour( const wxColour& col );
+    wxColour& operator = ( const wxColour& col );
 
     // dtor
-  ~wxColour();
+    virtual ~wxColour();
+
+
+    // accessors
+    virtual bool IsOk() 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; }
+
+    WXPixel GetPixel() const { return m_pixel; }
+    void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; }
+
+    inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
 
-  // Set() functions
-  void Set( unsigned char red, unsigned char green, unsigned char blue );
-  void Set( unsigned long colRGB )
-  {
-    // we don't need to know sizeof(long) here because we assume that the three
-    // least significant bytes contain the R, G and B values
-    Set((unsigned char)colRGB,
-        (unsigned char)(colRGB >> 8),
-        (unsigned char)(colRGB >> 16));
-  }
+    inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
 
-  // accessors
-  bool Ok() const {return m_isInit; }
+    // Allocate a colour, or nearest colour, using the given display.
+    // If realloc is true, ignore the existing pixel, otherwise just return
+    // the existing one.
+    // Returns the allocated pixel.
 
-  int GetPixel() const { return m_pixel; };
-  void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
+    // TODO: can this handle mono displays? If not, we should have an extra
+    // flag to specify whether this should be black or white by default.
 
-  // Allocate a colour, or nearest colour, using the given display.
-  // If realloc is TRUE, ignore the existing pixel, otherwise just return
-  // the existing one.
-  // Returns the allocated pixel.
+    WXPixel AllocColour(WXDisplay* display, bool realloc = false);
 
-  // TODO: can this handle mono displays? If not, we should have an extra
-  // flag to specify whether this should be black or white by default.
+protected:
+    // Helper function
+    void Init();
 
-  int AllocColour(WXDisplay* display, bool realloc = FALSE);
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 private:
-  bool          m_isInit;
-  unsigned char m_red;
-  unsigned char m_blue;
-  unsigned char m_green;
+    bool          m_isInit;
+    unsigned char m_red;
+    unsigned char m_blue;
+    unsigned char m_green;
 
 public:
-  int           m_pixel;
+    WXPixel       m_pixel;
 };
 
 #endif
-	// _WX_COLOUR_H_
+// _WX_COLOUR_H_