changed wxFDIODispatcher::UnregisterFD() to take only fd, without flags, and unregist...

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 4b40ce3fdadc2b21310bfcf7f0d7178731ddcb38..c3854f50b8475c65eb0d48eab1ca42ae627dae79 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -30,17 +30,19 @@ public:
 
 
     // dtor
-    ~wxColour();
+    virtual ~wxColour();
 
 
     // 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 Alpha() const { return m_alpha ; }
 
     // comparison
     bool operator==(const wxColour& colour) const
@@ -48,12 +50,13 @@ public:
         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; };
+    WXCOLORREF GetPixel() const { return m_pixel; }
 
 
 public:
@@ -63,13 +66,15 @@ protected:
     // Helper function
     void Init();
 
-    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue);
+    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)