aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ViewStyle.cxx
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2013-02-22 17:06:50 +1100
committernyamatongwe <devnull@localhost>2013-02-22 17:06:50 +1100
commit18e16eec6d4a66f9d9a365e2498ab511e56b6a97 (patch)
tree47dc5204d018285b8d80187dfff81eb6d658e1e6 /src/ViewStyle.cxx
parent64a54a3c407b2208f299701628619c55121da4a3 (diff)
downloadscintilla-mirror-18e16eec6d4a66f9d9a365e2498ab511e56b6a97.tar.gz
Define the maximum number of margins in Scintilla.iface.
Diffstat (limited to 'src/ViewStyle.cxx')
-rw-r--r--src/ViewStyle.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index b9284c05e..f316d264e 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -193,8 +193,8 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
someStylesForceCase = false;
leftMarginWidth = source.leftMarginWidth;
rightMarginWidth = source.rightMarginWidth;
- for (int i=0; i < margins; i++) {
- ms[i] = source.ms[i];
+ for (int margin=0; margin <= SC_MAX_MARGIN; margin++) {
+ ms[margin] = source.ms[margin];
}
maskInLine = source.maskInLine;
fixedColumnWidth = source.fixedColumnWidth;
@@ -308,7 +308,7 @@ void ViewStyle::Init(size_t stylesSize_) {
ms[2].mask = 0;
fixedColumnWidth = leftMarginWidth;
maskInLine = 0xffffffff;
- for (int margin=0; margin < margins; margin++) {
+ for (int margin=0; margin <= SC_MAX_MARGIN; margin++) {
fixedColumnWidth += ms[margin].width;
if (ms[margin].width > 0)
maskInLine &= ~ms[margin].mask;
@@ -389,7 +389,7 @@ void ViewStyle::Refresh(Surface &surface) {
fixedColumnWidth = leftMarginWidth;
maskInLine = 0xffffffff;
- for (int margin=0; margin < margins; margin++) {
+ for (int margin=0; margin <= SC_MAX_MARGIN; margin++) {
fixedColumnWidth += ms[margin].width;
if (ms[margin].width > 0)
maskInLine &= ~ms[margin].mask;