diff options
author | nyamatongwe <unknown> | 2000-10-13 12:09:26 +0000 |
---|---|---|
committer | nyamatongwe <unknown> | 2000-10-13 12:09:26 +0000 |
commit | a5f53b5aea3245eeb736293c3e023d456f7b9944 (patch) | |
tree | a6d72cf162223d3851cca1e702f57ec45e582bbe | |
parent | ceb3cc73ac6b69b98e5a299b1de6b6a7e8247c6e (diff) | |
download | scintilla-mirror-a5f53b5aea3245eeb736293c3e023d456f7b9944.tar.gz |
Better setting of charset for Eastern Europe and escape to allow
font to be specified completely with leading "-".
-rw-r--r-- | gtk/PlatGTK.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index d0c298685..46bffeb72 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -148,7 +148,7 @@ static const char *CharacterSetName(int characterSet) { case SC_CHARSET_DEFAULT: return "iso8859"; case SC_CHARSET_BALTIC: return "*"; case SC_CHARSET_CHINESEBIG5: return "*"; - case SC_CHARSET_EASTEUROPE: return "*"; + case SC_CHARSET_EASTEUROPE: return "iso8859-2"; case SC_CHARSET_GB2312: return "gb2312.1980"; case SC_CHARSET_GREEK: return "adobe"; case SC_CHARSET_HANGUL: return "ksc5601.1987"; @@ -171,6 +171,13 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) { // TODO: take notice of characterSet Release(); + // If name of the font begins with a '-', assume, that it is + // a full fontspec. + if (faceName[0] == '-'){ + id = gdk_font_load(faceName); + if (id) + return; + } char fontspec[300]; fontspec[0] = '\0'; strcat(fontspec, "-*-"); |