X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37f214d588b02079a3ddf64c2e46585ca1657c1b..38a097f588121ffcab2fa57e4494a6d0783c3567:/include/wx/os2/colour.h

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index dc4b7fa455..5f01ff010c 100644
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/os2/colour.h
 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:
@@ -15,75 +15,63 @@
 #include "wx/object.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase
 {
 public:
-  // ctors
+    // constructors
+    // ------------
+
     // default
-  wxColour();
-    // from RGB
-  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 );
-  wxColour( const wxColour* col );
-  wxColour& operator = ( const wxColour& col );
-
-    // dtor
-  ~wxColour();
-
-  // 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));
-  }
-
-  // accessors
-  bool Ok() const {return m_isInit; }
-
-  // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-  void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
+    wxColour();
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
+    // Copy ctors and assignment operators
+    wxColour(const wxColour& rCol);
+    wxColour(const wxColour* pCol);
+    wxColour&operator = (const wxColour& rCol);
+
+    // Dtor
+    ~wxColour();
+
+    // Accessors
+    bool Ok(void) const {return m_bIsInit; }
 
-  unsigned char Red() const { return m_red; }
-  unsigned char Green() const { return m_green; }
-  unsigned char Blue() const { return m_blue; }
+    unsigned char Red(void) const { return m_cRed; }
+    unsigned char Green(void) const { return m_cGreen; }
+    unsigned char Blue(void) const { return m_cBlue; }
 
-  // comparison
-  bool operator == (const wxColour& colour) const
-  {
-    return (m_red == colour.m_red &&
-            m_green == colour.m_green &&
-            m_blue == colour.m_blue);
-  }
-  bool operator != (const wxColour& colour) const { return !(*this == colour); }
+    // Comparison
+    bool operator == (const wxColour& rColour) const
+    {
+        return (m_bIsInit == rColour.m_bIsInit
+                && m_cRed   == rColour.m_cRed
+                && m_cGreen == rColour.m_cGreen
+                && m_cBlue  == rColour.m_cBlue
+               );
+    }
 
-  void InitFromName(const wxString& col);
+    bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
+
+    WXCOLORREF GetPixel(void) const { return m_vPixel; };
 
-/* TODO
-  WXCOLORREF GetPixel() const { return m_pixel; };
-*/
 
 private:
-  bool          m_isInit;
-  unsigned char m_red;
-  unsigned char m_blue;
-  unsigned char m_green;
+
+    // Helper function
+    void Init();
+
+    bool           m_bIsInit;
+    unsigned char  m_cRed;
+    unsigned char  m_cBlue;
+    unsigned char  m_cGreen;
+
+    virtual void InitWith( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
 
 public:
-     WXCOLORREF m_pixel ;
+    WXCOLORREF                      m_vPixel ;
 private:
-  DECLARE_DYNAMIC_CLASS(wxColour)
-};
+    DECLARE_DYNAMIC_CLASS(wxColour)
+}; // end of class wxColour
 
 #endif
   // _WX_COLOUR_H_