adding constants

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 8b9e828c4c61c3b30b7c2b56f79baf28cc2f5ecd..807fbfd68c97f2fbc68fa4fab5a5f3ddcf481e0c 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -36,6 +36,8 @@
 
 class WXDLLEXPORT wxColour;
 
 
 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
 
 //-----------------------------------------------------------------------------
 // wxColourBase: this class has no data members, just some functions to avoid


@@ -64,7 +66,7 @@ public:
     // Set() functions
     // ---------------
 
     // 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
         { 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
     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;
 
     // implemented in colourcmn.cpp
     virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const;

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 24bdf8381359f5640d11e0f9d67abaae25a6c710..2cad2126eeb06d9f6c1a08f0d9b0c281f15dec04 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -57,7 +57,7 @@ protected :
 
     void InitWith( unsigned char red, unsigned char green, unsigned char blue ) 
     {
 
     void InitWith( unsigned char red, unsigned char green, unsigned char blue ) 
     {

-        InitWith( red, green, blue , 255) ;
+        InitWith( red, green, blue , wxALPHA_OPAQUE ) ;

     }
 
     void InitWith( unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha );
     }
 
     void InitWith( unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha );