X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0edecea489b62db69eb74ca8f7623132cceab54..09e744f55267ee17225f1e25f4fb26f4d8927781:/include/wx/colour.h diff --git a/include/wx/colour.h b/include/wx/colour.h index 6c731ef546..e3dd34ee80 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -15,7 +15,6 @@ #include "wx/defs.h" #include "wx/gdiobj.h" - class WXDLLIMPEXP_FWD_CORE wxColour; // A macro to define the standard wxColour constructors: @@ -44,6 +43,10 @@ class WXDLLIMPEXP_FWD_CORE wxColour; 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 // ---------------------------------------------------------------------------- @@ -148,6 +151,22 @@ public: bool Ok() const { return IsOk(); } #endif + // 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 + 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); + + wxColour ChangeLightness(int ialpha) const; + // old, deprecated // ---------------