diff options
author | Neil <nyamatongwe@gmail.com> | 2018-05-14 13:57:03 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2018-05-14 13:57:03 +1000 |
commit | 7a4fd484cc8229d3518039c82d950b4fa7f673cb (patch) | |
tree | 56eb3385ec0c7da13691236af5c9b1d78b851b22 /src/ViewStyle.h | |
parent | 8e94953b2d9f7d946445759fe31d169879b680c8 (diff) | |
download | scintilla-mirror-7a4fd484cc8229d3518039c82d950b4fa7f673cb.tar.gz |
Backport: Modernize Platform.h (2) - noexcept, const, constexpr.
ColourDesired is an int instead of long for consistency over different platforms.
Changes made to Point, PRectangle, and ColourDesired.
RoundXYPosition removed.
Backport of changeset 6939:7441dcb96e6a.
Diffstat (limited to 'src/ViewStyle.h')
-rw-r--r-- | src/ViewStyle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ViewStyle.h b/src/ViewStyle.h index 2a4e7329a..800d8cb67 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -68,7 +68,7 @@ public: bool isSet; ColourOptional(ColourDesired colour_=ColourDesired(0,0,0), bool isSet_=false) : ColourDesired(colour_), isSet(isSet_) { } - ColourOptional(uptr_t wParam, sptr_t lParam) : ColourDesired(static_cast<long>(lParam)), isSet(wParam != 0) { + ColourOptional(uptr_t wParam, sptr_t lParam) : ColourDesired(static_cast<int>(lParam)), isSet(wParam != 0) { } }; @@ -84,7 +84,7 @@ struct EdgeProperties { column(column_), colour(colour_) { } EdgeProperties(uptr_t wParam, sptr_t lParam) : - column(static_cast<int>(wParam)), colour(static_cast<long>(lParam)) { + column(static_cast<int>(wParam)), colour(static_cast<int>(lParam)) { } }; |