Add wxTransparentColour global pseudo-variable.

Introduce a symbolic name for a fully transparent colour.

See #11897.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 9deb7abd4628909ccd88fb363b8b4663d4aa04e5..59306d7a6be90f2963a27d83a93c45b73cc3a298 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -499,6 +499,7 @@ All (GUI):
 - Add "initial selection" parameter to wxGetSingleChoice() (Nikolay Tjushkov).
 - Implement wxDocument::Revert() (troelsk).
 - Allow overriding print preview frame creation in docview (troelsk).
 - Add "initial selection" parameter to wxGetSingleChoice() (Nikolay Tjushkov).
 - Implement wxDocument::Revert() (troelsk).
 - Allow overriding print preview frame creation in docview (troelsk).

+- Added wxTransparentColour.

 
 GTK:
 
 
 GTK:
 

diff --git a/include/wx/colour.h b/include/wx/colour.h
index f2ca87a8772ed7e534ec76c437ccf6dd34b076c4..e3dd34ee801e85b0799eb5e32725d7a7223b3db0 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -43,6 +43,10 @@ class WXDLLIMPEXP_FWD_CORE wxColour;
 const unsigned char wxALPHA_TRANSPARENT = 0;
 const unsigned char wxALPHA_OPAQUE = 0xff;
 
 const unsigned char wxALPHA_TRANSPARENT = 0;
 const unsigned char wxALPHA_OPAQUE = 0xff;
 

+// a valid but fully transparent colour
+#define wxTransparentColour wxColour(0, 0, 0, wxALPHA_TRANSPARENT)
+#define wxTransparentColor wxTransparentColour
+

 // ----------------------------------------------------------------------------
 // wxVariant support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxVariant support
 // ----------------------------------------------------------------------------


@@ -149,14 +153,14 @@ public:
 
     // manipulation
     // ------------
 
     // manipulation
     // ------------

-    
+

     // These methods are static because they are mostly used
     // within tight loops (where we don't want to instantiate wxColour's)
 
     static void          MakeMono    (unsigned char* r, unsigned char* g, unsigned char* b, bool on);
     static void          MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char brightness = 255);
     static void          MakeGrey    (unsigned char* r, unsigned char* g, unsigned char* b); // integer version
     // These methods are static because they are mostly used
     // within tight loops (where we don't want to instantiate wxColour's)
 
     static void          MakeMono    (unsigned char* r, unsigned char* g, unsigned char* b, bool on);
     static void          MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char brightness = 255);
     static void          MakeGrey    (unsigned char* r, unsigned char* g, unsigned char* b); // integer version

-    static void          MakeGrey    (unsigned char* r, unsigned char* g, unsigned char* b, 
+    static void          MakeGrey    (unsigned char* r, unsigned char* g, unsigned char* b,

                                       double weight_r, double weight_g, double weight_b); // floating point version
     static unsigned char AlphaBlend  (unsigned char fg, unsigned char bg, double alpha);
     static void          ChangeLightness(unsigned char* r, unsigned char* g, unsigned char* b, int ialpha);
                                       double weight_r, double weight_g, double weight_b); // floating point version
     static unsigned char AlphaBlend  (unsigned char fg, unsigned char bg, double alpha);
     static void          ChangeLightness(unsigned char* r, unsigned char* g, unsigned char* b, int ialpha);

diff --git a/interface/wx/colour.h b/interface/wx/colour.h
index 82134dd1fb1bf38f3bd2c6cd8c19cfd3016564ec..a4771ec582f4a2597218977c45f86f1a642d325a 100644 (file)
--- a/interface/wx/colour.h
+++ b/interface/wx/colour.h
@@ -37,6 +37,7 @@
 
     @stdobjects
     - ::wxNullColour - An empty, invalid colour.
 
     @stdobjects
     - ::wxNullColour - An empty, invalid colour.

+    - ::wxTransparentColour - Valid but fully transparent colour (new in 2.9.1).

     - ::wxBLACK
     - ::wxBLUE
     - ::wxCYAN
     - ::wxBLACK
     - ::wxBLUE
     - ::wxCYAN