(xm_update_label, xm_update_list): Use the recommended

XmStringCreateLocalized function.  Add missing copyright.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 7db643bc14e5c935452b19bfc0c94898ebd8562b..70de6541928b18edffb31814fb01dc52b657979e 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * lwlib-Xm.c (xm_update_label, xm_update_list): Use the recommended
+       XmStringCreateLocalized function.  Add missing copyright.
+
        * lwlib-Xm.h: Add missing copyright and license notice.
 
 2005-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index e57fa57f93918f6123e79a78adc9cee372e9c54d..8a68cbe30f6bfda2de832ab4c897fa5bc4dca005 100644 (file)
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,11 +1,13 @@
 /* The lwlib interface to Motif widgets.
+   Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2004, 2005
+             Free Software Foundation, Inc.
    Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
@@ -368,7 +370,7 @@ xm_update_label (instance, widget, val)
       else
        {
          built_string =
-           XmStringCreateLtoR (val->value, XmSTRING_DEFAULT_CHARSET);
+           XmStringCreateLocalized (val->value);
          XtSetArg (al [ac], XmNlabelString, built_string); ac++;
        }
 
@@ -377,7 +379,7 @@ xm_update_label (instance, widget, val)
 
   if (val->key)
     {
-      key_string = XmStringCreateLtoR (val->key, XmSTRING_DEFAULT_CHARSET);
+      key_string = XmStringCreateLocalized (val->key);
       XtSetArg (al [ac], XmNacceleratorText, key_string); ac++;
     }
 
@@ -406,7 +408,7 @@ xm_update_list (instance, widget, val)
   for (cur = val->contents, i = 0; cur; cur = cur->next)
     if (cur->value)
       {
-       XmString xmstr = XmStringCreate (cur->value, XmSTRING_DEFAULT_CHARSET);
+       XmString xmstr = XmStringCreateLocalized (cur->value);
        i += 1;
        XmListAddItem (widget, xmstr, 0);
        if (cur->selected)

diff --git a/src/ChangeLog b/src/ChangeLog
index e7d9521d2fe8a9c131870cf57c2f13c8f0635a47..a159633b0fd9fa9cd2d6003512e61198aa241240 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2005-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * xfns.c (xic_create_fontsetname): Add `motif' argument.
+       Always return a freshly allocated string.
+       (xic_create_xfontset): Adjust call.
+
+       * xfaces.c (x_update_menu_appearance) [USE_MOTIF]:
+       Use xic_create_fontsetname to create a fontset so utf-8 locales work.
+       (dump_realized_face): Fix warning.
+
        * emacs.c (Fkill_emacs): YAILOM.
 
        * frame.c (Fignore_event): Fix ancient obscure C-u handling bug.