summaryrefslogtreecommitdiffstats
path: root/scintilla/src
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2011-05-26 09:49:16 +0000
committerXhmikosR <xhmikosr@users.sourceforge.net>2011-05-26 09:49:16 +0000
commit2e6dc9d726026c6b965a4739c018922407266f5d (patch)
treedbc8ad5d51901b410506447e2da2a08a4d3a8b27 /scintilla/src
parent4a93121951bef2f40e92450ba7b973f448b97dca (diff)
downloadnotepad2-mod-2e6dc9d726026c6b965a4739c018922407266f5d.zip
notepad2-mod-2e6dc9d726026c6b965a4739c018922407266f5d.tar.gz
notepad2-mod-2e6dc9d726026c6b965a4739c018922407266f5d.tar.bz2
update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@510 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src')
-rw-r--r--scintilla/src/Style.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/scintilla/src/Style.cxx b/scintilla/src/Style.cxx
index 59c30a3..ebca41d 100644
--- a/scintilla/src/Style.cxx
+++ b/scintilla/src/Style.cxx
@@ -143,7 +143,4 @@ void Style::ClearTo(const Style &source) {
void Style::Copy(Font &font_, const FontMeasurements &fm_) {
font.MakeAlias(font_);
(FontMeasurements &)(*this) = fm_;
-#if PLAT_WX
- ascent = surface.Ascent(font);
-#endif
}