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

[Miles Bader]

Index: emacs/lwlib/lwlib.c
diff -c emacs/lwlib/lwlib.c:1.49 emacs/lwlib/lwlib.c:1.50
*** emacs/lwlib/lwlib.c:1.49    Wed Nov 20 14:26:04 2002
--- emacs/lwlib/lwlib.c Tue Feb  4 09:08:23 2003
***************
*** 3,15 ****
  
  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,
! but WITHOUT ANY WARRANTY; without even the implied warranty of 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  
--- 3,15 ----
  
  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,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  
***************
*** 101,107 ****
  static void lw_pop_all_widgets P_ ((LWLIB_ID, Boolean));
  static Boolean get_one_value P_ ((widget_instance *, widget_value *));
  static void show_one_widget_busy P_ ((Widget, Boolean));
!      
  void
  lwlib_memset (address, value, length)
       char *address;
--- 101,107 ----
  static void lw_pop_all_widgets P_ ((LWLIB_ID, Boolean));
  static Boolean get_one_value P_ ((widget_instance *, widget_value *));
  static void show_one_widget_busy P_ ((Widget, Boolean));
! 
  void
  lwlib_memset (address, value, length)
       char *address;
***************
*** 190,196 ****
  }
  
  /* this is analogous to free().  It frees only what was allocated
!    by malloc_widget_value(), and no substructures. 
   */
  void
  free_widget_value (wv)
--- 190,196 ----
  }
  
  /* this is analogous to free().  It frees only what was allocated
!    by malloc_widget_value(), and no substructures.
   */
  void
  free_widget_value (wv)
***************
*** 251,257 ****
       change_type change;
  {
    widget_value* copy;
!   
    if (!val)
      return NULL;
    if (val == (widget_value *) 1)
--- 251,257 ----
       change_type change;
  {
    widget_value* copy;
! 
    if (!val)
      return NULL;
    if (val == (widget_value *) 1)
***************
*** 523,529 ****
        free_widget_value_tree (val1);
        return NULL;
      }
!   
    change = NO_CHANGE;
  
    if (safe_strcmp (val1->name, val2->name))
--- 523,529 ----
        free_widget_value_tree (val1);
        return NULL;
      }
! 
    change = NO_CHANGE;
  
    if (safe_strcmp (val1->name, val2->name))
***************
*** 591,597 ****
        merged_contents =
        merge_widget_value (val1->contents, val2->contents, level - 1,
                            change_p);
!       
        if (val1->contents && !merged_contents)
        {
          /* This used to say INVISIBLE_CHANGE,
--- 591,597 ----
        merged_contents =
        merge_widget_value (val1->contents, val2->contents, level - 1,
                            change_p);
! 
        if (val1->contents && !merged_contents)
        {
          /* This used to say INVISIBLE_CHANGE,
***************
*** 614,620 ****
  #endif
  #endif
        }
!       
        val1->contents = merged_contents;
      }
  
--- 614,620 ----
  #endif
  #endif
        }
! 
        val1->contents = merged_contents;
      }
  
***************
*** 640,646 ****
  
    val1->this_one_change = this_one_change;
    val1->change = change;
!   
    if (change > NO_CHANGE && val1->toolkit_data)
      {
        *change_p = 1;
--- 640,646 ----
  
    val1->this_one_change = this_one_change;
    val1->change = change;
! 
    if (change > NO_CHANGE && val1->toolkit_data)
      {
        *change_p = 1;
***************
*** 672,678 ****
        char* real_name = (char *) xmalloc (length);
        real_name [0] = '*';
        strcpy (real_name + 1, name);
!       
        widget = XtNameToWidget (instance->widget, real_name);
  
        free (real_name);
--- 672,678 ----
        char* real_name = (char *) xmalloc (length);
        real_name [0] = '*';
        strcpy (real_name + 1, name);
! 
        widget = XtNameToWidget (instance->widget, real_name);
  
        free (real_name);
***************
*** 691,697 ****
  #endif
  {
    Widget widget = name_to_widget (instance, val->name);
!   
    if (widget)
      {
  #if defined (USE_LUCID)
--- 691,697 ----
  #endif
  {
    Widget widget = name_to_widget (instance, val->name);
! 
    if (widget)
      {
  #if defined (USE_LUCID)
***************
*** 842,852 ****
  dialog_spec_p (name)
       char* name;
  {
!   /* return True if name matches [EILPQeilpq][1-9][Bb] or 
       [EILPQeilpq][1-9][Bb][Rr][1-9] */
    if (!name)
      return False;
!   
    switch (name [0])
      {
      case 'E': case 'I': case 'L': case 'P': case 'Q':
--- 842,852 ----
  dialog_spec_p (name)
       char* name;
  {
!   /* return True if name matches [EILPQeilpq][1-9][Bb] or
       [EILPQeilpq][1-9][Bb][Rr][1-9] */
    if (!name)
      return False;
! 
    switch (name [0])
      {
      case 'E': case 'I': case 'L': case 'P': case 'Q':
***************
*** 866,872 ****
        }
        else
        return False;
!     
      default:
        return False;
      }
--- 866,872 ----
        }
        else
        return False;
! 
      default:
        return False;
      }
***************
*** 908,914 ****
  #endif
        }
      }
!   
    if (!function)
      {
        printf ("No creation function for widget type %s\n",
--- 908,914 ----
  #endif
        }
      }
! 
    if (!function)
      {
        printf ("No creation function for widget type %s\n",
***************
*** 924,930 ****
    /*   XtRealizeWidget (instance->widget);*/
  }
  
! void 
  lw_register_widget (type, name, id, val, pre_activate_cb,
                    selection_cb, post_activate_cb, highlight_cb)
       char* type;
--- 924,930 ----
    /*   XtRealizeWidget (instance->widget);*/
  }
  
! void
  lw_register_widget (type, name, id, val, pre_activate_cb,
                    selection_cb, post_activate_cb, highlight_cb)
       char* type;
***************
*** 952,958 ****
  #endif
  {
    widget_instance* instance;
!   
    instance = find_instance (id, parent, pop_up_p);
    return instance ? instance->widget : NULL;
  }
--- 952,958 ----
  #endif
  {
    widget_instance* instance;
! 
    instance = find_instance (id, parent, pop_up_p);
    return instance ? instance->widget : NULL;
  }
***************
*** 969,975 ****
  {
    widget_instance* instance;
    widget_info* info;
!   
    instance = find_instance (id, parent, pop_up_p);
    if (!instance)
      {
--- 969,975 ----
  {
    widget_instance* instance;
    widget_info* info;
! 
    instance = find_instance (id, parent, pop_up_p);
    if (!instance)
      {
***************
*** 1009,1015 ****
                      post_activate_cb, highlight_cb);
    return lw_make_widget (id, parent, pop_up_p);
  }
!                 
  
  /* destroying the widgets */
  static void
--- 1009,1015 ----
                      post_activate_cb, highlight_cb);
    return lw_make_widget (id, parent, pop_up_p);
  }
! 
  
  /* destroying the widgets */
  static void
***************
*** 1046,1052 ****
  #if defined (USE_XAW)
        if (lw_xaw_widget_p (instance->widget))
        xaw_destroy_instance (instance);
!       else 
  #endif
        /* do not remove the empty statement */
        ;
--- 1046,1052 ----
  #if defined (USE_XAW)
        if (lw_xaw_widget_p (instance->widget))
        xaw_destroy_instance (instance);
!       else
  #endif
        /* do not remove the empty statement */
        ;
***************
*** 1060,1066 ****
       Widget w;
  {
    widget_instance* instance = get_widget_instance (w, True);
!   
    if (instance)
      {
        widget_info *info = instance->info;
--- 1060,1066 ----
       Widget w;
  {
    widget_instance* instance = get_widget_instance (w, True);
! 
    if (instance)
      {
        widget_info *info = instance->info;
***************
*** 1233,1239 ****
       widget_value* val;
  {
    Widget widget = name_to_widget (instance, val->name);
!       
    if (widget)
      {
  #if defined (USE_LUCID)
--- 1233,1239 ----
       widget_value* val;
  {
    Widget widget = name_to_widget (instance, val->name);
! 
    if (widget)
      {
  #if defined (USE_LUCID)
***************
*** 1310,1316 ****
  /* To forbid recursive calls */
  static Boolean lwlib_updating;
  
! /* This function can be used as a an XtCallback for the widgets that get 
    modified to update other instances of the widgets.  Closure should be the
    widget_instance. */
  void
--- 1310,1316 ----
  /* To forbid recursive calls */
  static Boolean lwlib_updating;
  
! /* This function can be used as a an XtCallback for the widgets that get
    modified to update other instances of the widgets.  Closure should be the
    widget_instance. */
  void
***************
*** 1390,1396 ****
    Widget widget_to_invert = XtNameToWidget (w, "*sheet");
    if (!widget_to_invert)
      widget_to_invert = w;
!   
    XtVaGetValues (widget_to_invert,
                 XtNforeground, &foreground,
                 XtNbackground, &background,
--- 1390,1396 ----
    Widget widget_to_invert = XtNameToWidget (w, "*sheet");
    if (!widget_to_invert)
      widget_to_invert = w;
! 
    XtVaGetValues (widget_to_invert,
                 XtNforeground, &foreground,
                 XtNbackground, &background,
***************
*** 1438,1444 ****
       Boolean doit;
  #endif
  {
! #if defined (USE_XAW)  
    XawPanedSetRefigureMode (w, doit);
  #endif
  #if defined (USE_MOTIF)
--- 1438,1444 ----
       Boolean doit;
  #endif
  {
! #if defined (USE_XAW)
    XawPanedSetRefigureMode (w, doit);
  #endif
  #if defined (USE_MOTIF)