adding command key accelerator

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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 98a8c298917a7675d86e920878984577453abbcf..685cab9d3dd2bd40774410dc6961a47e46b537ec 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -36,6 +36,8 @@
 
 class WXDLLEXPORT wxColour;
 
+const unsigned char wxALPHA_TRANSPARENT = 0;
+const unsigned char wxALPHA_OPAQUE = 0xff;
 
 //-----------------------------------------------------------------------------
 // wxColourBase: this class has no data members, just some functions to avoid
@@ -49,7 +51,7 @@ protected:
     virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue) = 0;
 
     // this will be overridden in alpha supporting classes
-    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha) 
+    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue, unsigned char WXUNUSED(alpha)) 
     {
         InitWith( red, green, blue ) ;
     }
@@ -64,7 +66,7 @@ public:
     // Set() functions
     // ---------------
 
-    void Set(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = 255)
+    void Set(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = wxALPHA_OPAQUE)
         { InitWith(red,green,blue, alpha); }
 
     // implemented in colourcmn.cpp
@@ -94,7 +96,7 @@ public:
     virtual unsigned char Green() const = 0;
     virtual unsigned char Blue() const = 0;
     virtual unsigned char Alpha() const
-        { return 255 ; }
+        { return wxALPHA_OPAQUE ; }
 
     // implemented in colourcmn.cpp
     virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const;
@@ -124,6 +126,8 @@ public:
 #include "wx/gtk1/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/generic/colour.h"
+#elif defined(__WXDFB__)
+#include "wx/generic/colour.h"
 #elif defined(__WXX11__)
 #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)