diff options
Diffstat (limited to 'gdk/win32/gdkdraw.c')
| -rw-r--r-- | gdk/win32/gdkdraw.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gdk/win32/gdkdraw.c b/gdk/win32/gdkdraw.c index be2705643..73f5e513d 100644 --- a/gdk/win32/gdkdraw.c +++ b/gdk/win32/gdkdraw.c @@ -447,13 +447,13 @@ gdk_draw_text_handler (GdkWin32SingleFont *singlefont, int wclen, void *arg) { - HDC hdc; HGDIOBJ oldfont; SIZE size; - GdkDrawablePrivate *drawable_private; - GdkGCPrivate *gc_private; gdk_draw_text_arg *argp = (gdk_draw_text_arg *) arg; + if (!singlefont) + return; + if ((oldfont = SelectObject (argp->hdc, singlefont->xfont)) == NULL) { g_warning ("gdk_draw_text_handler: SelectObject failed"); @@ -465,7 +465,7 @@ gdk_draw_text_handler (GdkWin32SingleFont *singlefont, GetTextExtentPoint32W (argp->hdc, wcstr, wclen, &size); argp->x += size.cx; - SelectObject (hdc, oldfont); + SelectObject (argp->hdc, oldfont); } /* gdk_draw_text @@ -480,7 +480,6 @@ gdk_draw_text (GdkDrawable *drawable, const gchar *text, gint text_length) { - HDC hdc; GdkDrawablePrivate *drawable_private; GdkGCPrivate *gc_private; wchar_t *wcstr; @@ -534,7 +533,6 @@ gdk_draw_text_wc (GdkDrawable *drawable, const GdkWChar *text, gint text_length) { - HDC hdc; GdkDrawablePrivate *drawable_private; GdkGCPrivate *gc_private; gint i, wlen; |