rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 5bf97af25d5babd79d07f0b7e8f31c3ffef5dcf1..223e1e0d98c99b069f4476f3f93233334698af5f 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -1,62 +1,73 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.h
+// Name:        wx/msw/colour.h

 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __COLOURH__
-#define __COLOURH__
+#ifndef _WX_COLOUR_H_
+#define _WX_COLOUR_H_

 
 

-#ifdef __GNUG__
-#pragma interface "colour.h"
-#endif
+#include "wx/object.h"

 
 

+// ----------------------------------------------------------------------------

 // Colour
 // Colour

-class WXDLLEXPORT wxColour: public wxObject
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxColour)

 public:
 public:

-  wxColour(void);
-  wxColour(const unsigned char r, const unsigned char g, const unsigned char b);
-  wxColour(const wxColour& col);
-  wxColour(const wxString& col);
-  ~wxColour(void) ;
-  wxColour& operator =(const wxColour& src) ;
-  wxColour& operator =(const wxString& src) ;
-  inline int Ok(void) const { return (m_isInit) ; }
-
-  void Set(unsigned char r, unsigned char g, unsigned char b);
-
-  // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-  void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
-
-  inline unsigned char Red(void) const { return m_red; }
-  inline unsigned char Green(void) const { return m_green; }
-  inline unsigned char Blue(void) const { return m_blue; }
-
-  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)); }
-
-  WXCOLORREF GetPixel(void) const { return m_pixel; };
-
- private:
-  bool                         m_isInit;
-  unsigned char m_red;
-  unsigned char m_blue;
-  unsigned char m_green;
- public:
-  WXCOLORREF m_pixel ;
-};
+    // constructors
+    // ------------
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
+    // 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; }
+    unsigned char Alpha() const { return m_alpha ; }
+
+    // comparison
+    bool operator==(const wxColour& colour) const
+    {
+        return m_isInit == colour.m_isInit
+            && m_red == colour.m_red
+            && m_green == colour.m_green
+            && m_blue == colour.m_blue
+            && m_alpha == colour.m_alpha;
+    }
+
+    bool operator!=(const wxColour& colour) const { return !(*this == colour); }

 
 

-#define wxColor wxColour
+    WXCOLORREF GetPixel() const { return m_pixel; }
+
+public:
+    WXCOLORREF m_pixel;
+
+protected:
+    // Helper function
+    void Init();
+
+    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;
+    unsigned char m_alpha;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxColour)
+};

 
 

-#endif
-       // __COLOURH__
+#endif // _WX_COLOUR_H_