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

[Dave Love]

Index: emacs/lwlib/lwlib-Xlw.c
diff -c emacs/lwlib/lwlib-Xlw.c:1.17 emacs/lwlib/lwlib-Xlw.c:1.18
*** emacs/lwlib/lwlib-Xlw.c:1.17        Tue Feb  4 09:08:23 2003
--- emacs/lwlib/lwlib-Xlw.c     Thu May 22 09:30:20 2003
***************
*** 1,5 ****
--- 1,6 ----
  /* The lwlib interface to "xlwmenu" menus.
     Copyright (C) 1992 Lucid, Inc.
+    Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc.
  
  This file is part of the Lucid Widget Library.
  
***************
*** 22,28 ****
  #include <config.h>
  #endif
  
! #include "../src/lisp.h"
  
  #include "lwlib-Xlw.h"
  #include <X11/StringDefs.h>
--- 23,29 ----
  #include <config.h>
  #endif
  
! #include "lisp.h"
  
  #include "lwlib-Xlw.h"
  #include <X11/StringDefs.h>
***************
*** 205,224 ****
  }
  
  void
  xlw_update_one_widget (instance, widget, val, deep_p)
       widget_instance* instance;
       Widget widget;
       widget_value* val;
       Boolean deep_p;
  {
-   XlwMenuWidget mw;
    Arg al[1];
  
-   if (XtIsShell (widget))
-     mw = (XlwMenuWidget)((CompositeWidget)widget)->composite.children [0];
-   else
-     mw = (XlwMenuWidget)widget;
- 
    /* This used to use XtVaSetValues, but some old Xt versions
       that have a bug in XtVaCreateWidget might have it here too.  */
    XtSetArg (al[0], XtNmenu, instance->info->val);
--- 206,224 ----
  }
  
  void
+ #ifdef PROTOTYPES
+ xlw_update_one_widget (widget_instance* instance, Widget widget,
+                      widget_value* val, Boolean deep_p)
+ #else
  xlw_update_one_widget (instance, widget, val, deep_p)
       widget_instance* instance;
       Widget widget;
       widget_value* val;
       Boolean deep_p;
+ #endif
  {
    Arg al[1];
  
    /* This used to use XtVaSetValues, but some old Xt versions
       that have a bug in XtVaCreateWidget might have it here too.  */
    XtSetArg (al[0], XtNmenu, instance->info->val);
***************
*** 236,244 ****
--- 236,248 ----
  }
  
  void
+ #ifdef PROTOTYPES
+ xlw_pop_instance (widget_instance* instance, Boolean up)
+ #else
  xlw_pop_instance (instance, up)
       widget_instance* instance;
       Boolean up;
+ #endif
  {
  }