cleaning up problems after string changes

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 556a5b9621a2e75b3f3933cfbac898543fa47866..0faf3d086e2792ae672266e030005f4ce1c8de4d 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -18,7 +18,7 @@
 // Colour
 // ----------------------------------------------------------------------------
 
 // Colour
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // constructors
 {
 public:
     // constructors


@@ -26,53 +26,23 @@ public:
 
     // default
     wxColour() { Init(); }
 
     // default
     wxColour() { Init(); }

+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS

 
 

-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-        { Set(red, green, blue); }
-
-    // from packed RGB
-    wxColour( unsigned long colRGB ) { Set(colRGB); }
-
-    // implicit conversion from the colour name
-    wxColour(const wxString &colourName) { InitFromName(colourName); }
-    wxColour(const wxChar *colourName) { InitFromName(colourName); }
-
-
-    // copy ctors and assignment operators
-    wxColour(const wxColour& col);
-    wxColour& operator=( const wxColour& col);

 
     // dtor
 
     // dtor

-    ~wxColour();
-
+    virtual ~wxColour();

 
 

-    // other methods
-    // -------------
-
-    // to have the matching Create also for this class
-    void Create( unsigned char red, unsigned char green, unsigned char blue )
-    { Set(red, green, 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));
-    }

 
     // accessors
     // ---------
 
 
     // accessors
     // ---------
 

-    bool Ok() const { return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    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 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
 
     // comparison
     bool operator==(const wxColour& colour) const


@@ -80,14 +50,14 @@ public:
         return m_isInit == colour.m_isInit
             && m_red == colour.m_red
             && m_green == colour.m_green
         return m_isInit == colour.m_isInit
             && m_red == colour.m_red
             && m_green == colour.m_green

-            && m_blue == colour.m_blue;
+            && m_blue == colour.m_blue
+            && m_alpha == colour.m_alpha;

     }
 
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     WXCOLORREF GetPixel() const { return m_pixel; };
 
     }
 
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     WXCOLORREF GetPixel() const { return m_pixel; };
 

-    void InitFromName(const wxString& colourName);

 
 public:
     WXCOLORREF m_pixel;
 
 public:
     WXCOLORREF m_pixel;


@@ -96,11 +66,15 @@ protected:
     // Helper function
     void Init();
 
     // 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;
 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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)