[Emacs-diffs] Changes to emacs/lwlib/lwlib-Xm.c

[Stefan Monnier]

Index: emacs/lwlib/lwlib-Xm.c
diff -c emacs/lwlib/lwlib-Xm.c:1.49 emacs/lwlib/lwlib-Xm.c:1.50
*** emacs/lwlib/lwlib-Xm.c:1.49 Mon Jan 12 01:45:22 2004
--- emacs/lwlib/lwlib-Xm.c      Thu Mar 17 19:03:03 2005
***************
*** 1,11 ****
  /* The lwlib interface to Motif widgets.
     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)
  any later version.
  
  The Lucid Widget Library is distributed in the hope that it will be useful,
--- 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 2, or (at your option)
  any later version.
  
  The Lucid Widget Library is distributed in the hope that it will be useful,
***************
*** 368,374 ****
        else
        {
          built_string =
!           XmStringCreateLtoR (val->value, XmSTRING_DEFAULT_CHARSET);
          XtSetArg (al [ac], XmNlabelString, built_string); ac++;
        }
  
--- 370,376 ----
        else
        {
          built_string =
!           XmStringCreateLocalized (val->value);
          XtSetArg (al [ac], XmNlabelString, built_string); ac++;
        }
  
***************
*** 377,383 ****
  
    if (val->key)
      {
!       key_string = XmStringCreateLtoR (val->key, XmSTRING_DEFAULT_CHARSET);
        XtSetArg (al [ac], XmNacceleratorText, key_string); ac++;
      }
  
--- 379,385 ----
  
    if (val->key)
      {
!       key_string = XmStringCreateLocalized (val->key);
        XtSetArg (al [ac], XmNacceleratorText, key_string); ac++;
      }
  
***************
*** 406,412 ****
    for (cur = val->contents, i = 0; cur; cur = cur->next)
      if (cur->value)
        {
!       XmString xmstr = XmStringCreate (cur->value, XmSTRING_DEFAULT_CHARSET);
        i += 1;
        XmListAddItem (widget, xmstr, 0);
        if (cur->selected)
--- 408,414 ----
    for (cur = val->contents, i = 0; cur; cur = cur->next)
      if (cur->value)
        {
!       XmString xmstr = XmStringCreateLocalized (cur->value);
        i += 1;
        XmListAddItem (widget, xmstr, 0);
        if (cur->selected)