aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Style.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-05-22 08:18:01 +1000
committerNeil <nyamatongwe@gmail.com>2021-05-22 08:18:01 +1000
commitc8235ba0e0292f209a8233613669e2cff8de80da (patch)
tree117df121f92601300eeb2e9a047860384eb17d79 /src/Style.h
parent7f8a8cfb32aecb70fe10ef26fe096f4092f7e673 (diff)
downloadscintilla-mirror-c8235ba0e0292f209a8233613669e2cff8de80da.tar.gz
Rename ColourAlpha to ColourRGBA to avoid clashes when a ColourAlpha typedef
will be published in externally visible header.
Diffstat (limited to 'src/Style.h')
-rw-r--r--src/Style.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Style.h b/src/Style.h
index 8f9b1d334..cee63aa9e 100644
--- a/src/Style.h
+++ b/src/Style.h
@@ -44,8 +44,8 @@ struct FontMeasurements {
*/
class Style : public FontSpecification, public FontMeasurements {
public:
- ColourAlpha fore;
- ColourAlpha back;
+ ColourRGBA fore;
+ ColourRGBA back;
bool eolFilled;
bool underline;
enum class CaseForce {mixed, upper, lower, camel};
@@ -62,7 +62,7 @@ public:
~Style();
Style &operator=(const Style &source) noexcept;
Style &operator=(Style &&) = delete;
- void Clear(ColourAlpha fore_, ColourAlpha back_,
+ void Clear(ColourRGBA fore_, ColourRGBA back_,
int size_,
const char *fontName_, int characterSet_,
int weight_, bool italic_, bool eolFilled_,