Allow displaying Japanese character with wxMotif/ANSI under a
Japanese EUC-JP locale: - add a #define (wxMOTIF_NEW_FONT_HANDLING) defaulting to off - factor the code for getting text extents in a central wxGetTextExtent function - when the new font handling is enabled load a fontset instead of a single font. For non-Japanese locales this should load a fontset containing a single font. - on a Japanese locale set the default point size to 15: the Japanese fonts I have are much more readable like this. - do not set the wordwrap property for multiline wxTextCtrl with OpenMotif 2.1, otherwise it crashes when text is added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxColour;
|
||||
#define wxCHECK_LESSTIF_VERSION( major, minor ) \
|
||||
( LesstifVersion >= (major) * 1000 + (minor) )
|
||||
|
||||
#define wxCHECK_LESSTIF() ( defined(LesstifVersion) && LesstifVersion > 0 )
|
||||
#define wxCHECK_LESSTIF() ( __WXLESSTIF__ )
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Miscellaneous functions
|
||||
@@ -96,6 +96,10 @@ extern void wxDoChangeBackgroundColour(WXWidget widget,
|
||||
wxColour& backgroundColour,
|
||||
bool changeArmColour = false);
|
||||
extern void wxDoChangeFont(WXWidget widget, wxFont& font);
|
||||
extern void wxGetTextExtent(WXDisplay* display, const wxFont& font,
|
||||
double scale,
|
||||
const wxString& string, int* width, int* height,
|
||||
int* ascent, int* descent);
|
||||
|
||||
#define wxNO_COLORS 0x00
|
||||
#define wxBACK_COLORS 0x01
|
||||
|
Reference in New Issue
Block a user