diff options
author | Tor Lillqvist <tml@iki.fi> | 1999-10-13 21:46:33 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 1999-10-13 21:46:33 +0000 |
commit | 018d098240567972205f0ade11c8cdc8eb5a91c1 (patch) | |
tree | ab74eb5c1b96aac36494e9719de7fa1eff68d9a5 /gdk/win32/gdkevents-win32.c | |
parent | b39839820b92175c4bed79e0d1a3bf8e763b34cc (diff) | |
download | gtk+-018d098240567972205f0ade11c8cdc8eb5a91c1.tar.gz |
Don't use TextOutW for GDK_FONT_FONT fonts (which is all we have for now,
1999-10-14 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_text_wc): Don't use TextOutW for
GDK_FONT_FONT fonts (which is all we have for now, we don't
emulate fontsets). The X11 version uses plain XDrawString in that
case, too. The string passed to gdk_draw_text_wc seems to be in
fact (at least, when used by gtkentry and gtktext) either in a
single-byte charset, or a DBCS. Not Unicode.
This fixes the problem in gtkfontsel, where even if you had
selected a font with a non-Latin1 charset (windows-greek, for
instance), the preview still used Latin-1 glyphs.
* gdk/win32/gdkfont.c (gdk_text_width_wc): Similar change. Don't
use GetTextExtentPoint32W, use GetTextExtentPoint32A.
(gdk_font_load): Recognize the demibold etc weights, even if we
don't have the corresponding constants in the headers.
(gdk_font_hash_insert): Use same hash mechanism as in the X11
version. Should save font resources a bit, when we don't have
multiple HFONTs for the same font.
* gdk/win32/gdkprivate.h: Add the names field as in the X11
version.
Diffstat (limited to 'gdk/win32/gdkevents-win32.c')
-rw-r--r-- | gdk/win32/gdkevents-win32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 653e62ba79..53097d20b7 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2898,7 +2898,8 @@ gdk_events_queue (void) while (!gdk_event_queue_find_first() && PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) { - GDK_NOTE (EVENTS, g_print ("gdk_events_queue: got event\n")); + GDK_NOTE (EVENTS, g_print ("gdk_events_queue: PeekMessage: %#x\n", + msg.message)); TranslateMessage (&msg); event = gdk_event_new (); |