update Scintilla

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@576 28bd50df-7adb-d945-0439-6e466c6a13cc

1 files changed, 6 insertions, 6 deletions

diff --git a/scintilla/src/Style.h b/scintilla/src/Style.h
index 9c1bf35..1cd085f 100644
--- a/scintilla/src/Style.h
+++ b/scintilla/src/Style.h
@@ -14,16 +14,16 @@ namespace Scintilla {
 

 struct FontSpecification {

 	const char *fontName;

-	bool bold;

+	int weight;

 	bool italic;

 	int size;

 	int characterSet;

 	int extraFontFlag;

 	FontSpecification() :

 		fontName(0),

-		bold(false),

+		weight(SC_WEIGHT_NORMAL),

 		italic(false),

-		size(10),

+		size(10 * SC_FONT_SIZE_MULTIPLIER),

 		characterSet(0),

 		extraFontFlag(0) {

 	}

@@ -58,8 +58,8 @@ struct FontMeasurements {
  */

 class Style : public FontSpecification, public FontMeasurements {

 public:

-	ColourPair fore;

-	ColourPair back;

+	ColourDesired fore;

+	ColourDesired back;

 	bool eolFilled;

 	bool underline;

 	enum ecaseForced {caseMixed, caseUpper, caseLower};

@@ -77,7 +77,7 @@ public:
 	void Clear(ColourDesired fore_, ColourDesired back_,

 	           int size_,

 	           const char *fontName_, int characterSet_,

-	           bool bold_, bool italic_, bool eolFilled_,

+	           int weight_, bool italic_, bool eolFilled_,

 	           bool underline_, ecaseForced caseForce_,

 		   bool visible_, bool changeable_, bool hotspot_);

 	void ClearTo(const Style &source);