diff options
| author | nyamatongwe <unknown> | 2011-06-06 08:11:18 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-06-06 08:11:18 +1000 |
| commit | bd88866db20ffb28513e713957ba8c27e47a8a08 (patch) | |
| tree | 1c29d44ec498937bfa25db155e3cee0aae64b18a | |
| parent | 4d97af95b345a9567734893b91413d1050a2c01f (diff) | |
| download | scintilla-mirror-bd88866db20ffb28513e713957ba8c27e47a8a08.tar.gz | |
Fix problem compiling on wxWidgets. Bug #3306156.
From Morten MacFly.
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | include/Platform.h | 3 | ||||
| -rw-r--r-- | src/Style.cxx | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 3498e82c2..5b0b0d5f8 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -374,6 +374,7 @@ <td>Adobe</td> <td>Elizabeth A. Irizarry</td> <td>Mike Schroeder</td> + <td>Morten MacFly</td> </tr> </table> <p> diff --git a/include/Platform.h b/include/Platform.h index fd36a322e..1e9aeda44 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -301,6 +301,9 @@ public: FontID GetID() { return fid; } // Alias another font - caller guarantees not to Release void SetID(FontID fid_) { fid = fid_; } +#if PLAT_WX + void SetAscent(int ascent_) { ascent = ascent_; } +#endif friend class Surface; friend class SurfaceImpl; }; diff --git a/src/Style.cxx b/src/Style.cxx index ce1f0908e..fc250f0bc 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -142,5 +142,8 @@ void Style::ClearTo(const Style &source) { void Style::Copy(Font &font_, const FontMeasurements &fm_) { font.MakeAlias(font_); +#if PLAT_WX + font.SetAscent(fm_.ascent); +#endif (FontMeasurements &)(*this) = fm_; } |