Include keyboard.h, charset.h, coding.h.

(xg_create_frame_widgets): Use ENCODE_UTF_8.

2 files changed, 37 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d5423516f00..7ecdb754e1d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,35 @@
+2003-06-02  Dave Love  <fx@gnu.org>
+
+        * callproc.c: Use HAVE_FCNTL_H, not USG5.
+        (syms_of_callproc) <process-environment>: Doc fix.
+
+        * doc.c: Use HAVE_FCNTL_H, not USG5.
+
+        * xfaces.c (font_rescale_ratio): Fix for K&R.
+
+        * termcap.c: Use HAVE_FCNTL_H, not _POSIX_VERSION.
+
+        * mem-limits.h: Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
+
+        * lread.c [HAVE_FCNTL_H]: Include fcntl.h.
+
+        * gtkutil.c: Include keyboard.h, charset.h, coding.h.
+        (xg_create_frame_widgets): Use ENCODE_UTF_8.
+
+        * xterm.c (Qutf_8): Moved to coding.c
+
+        * xmenu.c (ENCODE_MENU_STRING): New.
+        (list_of_panes, list_of_items, digest_single_submenu, xmenu_show):
+        Use it.
+
+        * coding.h (ENCODE_UTF_8): New.
+        (Qutf_8): Declare.
+
+        * coding.c (Qutf_8): New.
+        (syms_of_coding): Intern it.
+
+        * fns.c: Doc fixes.
+
 2003-06-02  Kenichi Handa  <handa@m17n.org>
 
         * buffer.c (Fset_buffer_multibyte): Fix previous change.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index f2690635f53..76d16c07695 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -31,6 +31,9 @@ Boston, MA 02111-1307, USA.  */
 #include "atimer.h"
 #include "gtkutil.h"
 #include "termhooks.h"
+#include "keyboard.h"
+#include "charset.h"
+#include "coding.h"
 #include <gdk/gdkkeysyms.h>
 
 #define FRAME_TOTAL_PIXEL_HEIGHT(f) \
@@ -498,8 +501,8 @@ xg_create_frame_widgets (f)
   gtk_widget_set_name (wfixed, SDATA (Vx_resource_name));
 
   /* If this frame has a title or name, set it in the title bar.  */
-  if (! NILP (f->title)) title = SDATA (f->title);
-  else if (! NILP (f->name)) title = SDATA (f->name);
+  if (! NILP (f->title)) title = SDATA (ENCODE_UTF_8 (f->title));
+  else if (! NILP (f->name)) title = SDATA (ENCODE_UTF_8 (f->name));
 
   if (title) gtk_window_set_title (GTK_WINDOW (wtop), title);