diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-04-02 10:37:03 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-04-02 10:37:03 +0000 |
| commit | 9330b29f42fbc723a2e21e4365608b224cf0ce6f (patch) | |
| tree | 780f47349fdca223cd48199b7d2021c83e27601d | |
| parent | 869440338740a48d949080a5cb29a561a7db4acc (diff) | |
| download | notepad2-mod-9330b29f42fbc723a2e21e4365608b224cf0ce6f.zip notepad2-mod-9330b29f42fbc723a2e21e4365608b224cf0ce6f.tar.gz notepad2-mod-9330b29f42fbc723a2e21e4365608b224cf0ce6f.tar.bz2 | |
update Scintilla, cosmetics
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@457 28bd50df-7adb-d945-0439-6e466c6a13cc
| -rw-r--r-- | scintilla/src/ViewStyle.cxx | 8 | ||||
| -rw-r--r-- | src/Notepad2.ver | 48 |
2 files changed, 28 insertions, 28 deletions
diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx index 29c6bbb..e95b819 100644 --- a/scintilla/src/ViewStyle.cxx +++ b/scintilla/src/ViewStyle.cxx @@ -117,10 +117,10 @@ FontRealised *FontRealised::Find(const FontSpecification &fs) { void FontRealised::FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent) {
FontRealised *fr = this;
while (fr) {
- if (maxAscent < ascent)
- maxAscent = ascent;
- if (maxDescent < descent)
- maxDescent = descent;
+ if (maxAscent < fr->ascent)
+ maxAscent = fr->ascent;
+ if (maxDescent < fr->descent)
+ maxDescent = fr->descent;
fr = fr->frNext;
}
}
diff --git a/src/Notepad2.ver b/src/Notepad2.ver index f523c30..1dc737e 100644 --- a/src/Notepad2.ver +++ b/src/Notepad2.ver @@ -39,30 +39,30 @@ VS_VERSION_INFO VERSIONINFO FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
- BLOCK "StringFileInfo"
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
BEGIN
- BLOCK "040904b0"
- BEGIN
- #if defined(_WIN64)
- VALUE "Comments", APPNAME_STRA_X64
- VALUE "FileDescription", APPNAME_STRA_X64
- VALUE "InternalName", APPNAME_STRA_X64
- VALUE "ProductName", APPNAME_STRA_X64
- #else
- VALUE "Comments", APPNAME_STRA
- VALUE "FileDescription", APPNAME_STRA
- VALUE "InternalName", APPNAME_STRA
- VALUE "ProductName", APPNAME_STRA
- #endif
- //VALUE "CompanyName", "Florian Balmer"
- VALUE "FileVersion", VERSION_FILEVERSION
- VALUE "ProductVersion", VERSION_FILEVERSION
- VALUE "LegalCopyright", VERSION_LEGALCOPYRIGHT_LONG
- VALUE "OriginalFilename", "Notepad2.exe"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
+ #if defined(_WIN64)
+ VALUE "Comments", APPNAME_STRA_X64
+ VALUE "FileDescription", APPNAME_STRA_X64
+ VALUE "InternalName", APPNAME_STRA_X64
+ VALUE "ProductName", APPNAME_STRA_X64
+ #else
+ VALUE "Comments", APPNAME_STRA
+ VALUE "FileDescription", APPNAME_STRA
+ VALUE "InternalName", APPNAME_STRA
+ VALUE "ProductName", APPNAME_STRA
+ #endif
+ //VALUE "CompanyName", "Florian Balmer"
+ VALUE "FileVersion", VERSION_FILEVERSION
+ VALUE "ProductVersion", VERSION_FILEVERSION
+ VALUE "LegalCopyright", VERSION_LEGALCOPYRIGHT_LONG
+ VALUE "OriginalFilename", "Notepad2.exe"
END
END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
|