diff options
Diffstat (limited to 'src/Style.cxx')
| -rw-r--r-- | src/Style.cxx | 15 | 
1 files changed, 10 insertions, 5 deletions
| diff --git a/src/Style.cxx b/src/Style.cxx index 5989dae80..2ee09f57d 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -16,13 +16,13 @@ Style::Style() {  	aliasOfDefaultFont = true;  	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),  	      Platform::DefaultFontSize(), 0, SC_CHARSET_DEFAULT, -	      false, false, false, false, caseMixed, true); +	      false, false, false, false, caseMixed, true, true);  }  Style::Style(const Style &source) {  	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),  	      0, 0, 0, -	      false, false, false, false, caseMixed, true); +	      false, false, false, false, caseMixed, true, true);  	fore.desired = source.fore.desired;  	back.desired = source.back.desired;  	characterSet = source.characterSet; @@ -33,6 +33,7 @@ Style::Style(const Style &source) {  	underline = source.underline;  	caseForce = source.caseForce;  	visible = source.visible; +	changeable = source.changeable;  }  Style::~Style() { @@ -48,7 +49,7 @@ Style &Style::operator=(const Style &source) {  		return * this;  	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),  	      0, 0, SC_CHARSET_DEFAULT, -	      false, false, false, false, caseMixed, true); +	      false, false, false, false, caseMixed, true, true);  	fore.desired = source.fore.desired;  	back.desired = source.back.desired;  	characterSet = source.characterSet; @@ -59,13 +60,15 @@ Style &Style::operator=(const Style &source) {  	underline = source.underline;  	caseForce = source.caseForce;  	visible = source.visible; +	changeable = source.changeable;  	return *this;  }  void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_,                    const char *fontName_, int characterSet_,                    bool bold_, bool italic_, bool eolFilled_,  -                  bool underline_, ecaseForced caseForce_, bool visible_) { +                  bool underline_, ecaseForced caseForce_,  +		  bool visible_, bool changeable_) {  	fore.desired = fore_;  	back.desired = back_;  	characterSet = characterSet_; @@ -77,6 +80,7 @@ void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_,  	underline = underline_;  	caseForce = caseForce_;  	visible = visible_; +	changeable = changeable_;  	if (aliasOfDefaultFont)  		font.SetID(0);  	else @@ -96,7 +100,8 @@ void Style::ClearTo(const Style &source) {  		source.eolFilled,  		source.underline,  		source.caseForce, -		source.visible); +		source.visible,  +		source.changeable);  }  bool Style::EquivalentFontTo(const Style *other) const { | 
