1c1
< #include "ArgPack.h"
---
> #include "menupackP.h"
3c3
< #include "RMFBuffer.h"
---
> #include "ArgPack.h"
5,12d4
< #include "alfonts.h"
< #include "alxms.h"
< #include "assert.h"
< #include "debug.h"
< #include "memory.h"
< #include "menupackP.h"
< #include "registry.h"
< #include "sysdep.h"
13a6,7
> #include "registry.h"
> #include "assert.h"
14a9,13
> #include "sysdep.h"
> #include "memory.h"
> #include "alxms.h"
> #include "debug.h"
> #include "RMFBuffer.h"
16d14
< #include <Xm/CascadeBG.h>
20,21d17
< #include <Xm/MenuShell.h>
< #include <Xm/PushBG.h>
22a19,21
> #include <Xm/PushBG.h>
> #include <Xm/CascadeBG.h>
> #include <Xm/MenuShell.h>
46d44
<   cp->OptionRCArgs=NULL;
67d64
<   cp->OptionRCArgs=NULL;
89d85
<   cp->OptionRCArgs=NULL;
114d109
<   cp->OptionRCArgs=NULL;
147,148d141
<   if (m->OptionRCArgs!=NULL)
<     ArgPack_delete(m->OptionRCArgs);
153c146
< MenuPackRec MenuPack_create_rec(name,CB,data)
---
> MenuPackRec MenuPack_create_rec(name,CB,data,ap)
211d203
<   { XmNshellUnitType, (XtArgVal) Xm100TH_MILLIMETERS },
216d207
<   { XmNunitType, (XtArgVal) Xm100TH_MILLIMETERS },
226d216
<   { XmNunitType, (XtArgVal) Xm100TH_MILLIMETERS },
232d221
<   { XmNunitType, (XtArgVal) Xm100TH_MILLIMETERS },
276,277c265,266
<       if (!(mpRec->sub_menu->Flags & MP_SUBMENU))
< 	  Al_fatal_error1("menupack: %s: cannot have non cascading menus in option menu.\n",
---
>       if (!(mpp->Flags & MP_SUBMENU))
> 	  Al_fatal_error1("menupack: %s: cannot have cascading menus in option menu.\n",
280d268
<       ArgPack_add_arg(AP,XmNunitType, (XtArgVal) Xm100TH_MILLIMETERS);
372c360
<   if (mpp->Flags & MP_POPUP) {
---
>   if ((mpp->Flags & MP_POPUP) ) {
384,385c372
<     RMFBuffer_destroy(B);
< 
---
>     
417,418d403
<     if (mpp->OptionRCArgs!=NULL)
<       AP=ArgPack_copy_and_append(AP,mpp->OptionRCArgs);
420,423c405,407
<     ArgPack_add_arg(AP,XmNfontList,(XtArgVal)AlFonts_get(mpp->MenuPane));
<     ArgPack_add_arg(AP,XmNlabelString,(XtArgVal)Alxms_create(mpp->Strings,
< 							mpp->optionName,
< 						      ALFONTS_MINOR_HEADING));
---
>     ArgPack_add_arg(AP,XmNstring,(XtArgVal)Alxms_create(mpp->Strings,
> 							"",
> 					(char*)XmSTRING_DEFAULT_CHARSET));
623,634d606
< /*--------------------------------------------------------*/
< Widget MenuPack_option_get_label(mpp)
< MenuPack mpp;
< {
<   extern Widget XmOptionLabelGadget();
<   if (!(mpp->Flags & MP_OPTION))
<     Al_fatal_error("menupack: attempt to get label widget from non option menu\n");
<   if (mpp->Instantiated==Bool_TRUE)
<     return(XmOptionLabelGadget(mpp->OptionW));
<   else
<     return(NULL);
< }
636,660d607
< /*--------------------------------------------------------*/
< Widget MenuPack_option_get_button(mpp)
< MenuPack mpp;
< {
<   extern Widget XmOptionButtonGadget();
<   if (!(mpp->Flags & MP_OPTION))
<     Al_fatal_error("menupack: attempt to get button widget from non option menu\n");
<   if (mpp->Instantiated==Bool_TRUE)
<     return(XmOptionButtonGadget(mpp->OptionW));
<   else
<     return(NULL);
< }
< 
< /*--------------------------------------------------*/
< NORET MenuPack_option_set_args(mpp,args)
< MenuPack mpp;
< ArgPack args;
< {
<   if (!(mpp->Flags & MP_OPTION))
<     Al_fatal_error("menupack: attempt to set args from non option menu\n");
<   if (mpp->OptionRCArgs==NULL)
<     mpp->OptionRCArgs=ArgPack_create();
<   mpp->OptionRCArgs=ArgPack_copy_and_append(mpp->OptionRCArgs,args);
< }
< 
672a620,628
> 
> 
> 
> 
> 
> 
> 
> 
>