Revert "Use wide character API in the Windows IME module"

Ha, pango_win32_font_logfontw hasn't been exported from libpangowin32
after all due to a typo. This will have to wait. And actually
libpangowin32 is supposed to be deprecated surely, so that
functionality should be moved to libpangocairo or something.

This reverts commit 804effba9938b3e5ffcad1e731fdf83daf3e0aac.

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index 2b608a4b83a7351dee2ff152a94371e63a3788c3..84fd1e0c8319c15aefdd5912f769be989e83122f 100644 (file)
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -790,7 +790,7 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context)
   gunichar wc;
   PangoContext *pango_context;
   PangoFont *font;
-  LOGFONTW *logfont;
+  LOGFONT *logfont;
 
   g_return_if_fail (GTK_IS_IM_CONTEXT_IME (context));
 
@@ -878,9 +878,9 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context)
   if (!font)
     goto ERROR_OUT;
 
-  logfont = pango_win32_font_logfontw (font);
+  logfont = pango_win32_font_logfont (font);
   if (logfont)
-    ImmSetCompositionFontW (himc, logfont);
+    ImmSetCompositionFont (himc, logfont);
 
   g_object_unref (font);