Have you committed this?

----- Original Message -----
From: Tito Latini <tito.01beta@gmail.com>
Date: Monday, December 5, 2011 10:16 pm
Subject: [Cs-dev] FLpack arguments missing (fixed)
To: csound-devel@lists.sourceforge.net

> >From the manual the syntax of the FLpack opcode is
>
>   FLpack iwidth, iheight, ix, iy, itype, ispace, iborder
>
> but the code in InOut/widgets.cpp (StartPack function)
> takes only 4 arguments: iwidth, iheight, ix, iy (FLSCROLL struct !?).
>
> Besides, I have noticed that the values of iborder are unused in the
> fltk containers for allowing the compatibility with fltk 1.0.11
> and 1.3.0
>
> It works
>
> diff -ur csound5~/InOut/widgets.cpp csound5/InOut/widgets.cpp
> --- csound5~/InOut/widgets.cpp 2011-12-03 08:29:13.000000000 +0100
> +++ csound5/InOut/widgets.cpp 2011-12-05 22:42:32.000000000 +0100
> @@ -2663,13 +2663,17 @@
>  
>    //-----------
>  
> -  static int StartPack(CSOUND *csound, FLSCROLL *p)
> +  static int StartPack(CSOUND *csound, FLPACK *p)
>    {
>        Fl_Pack *o = new Fl_Pack
> ((int) *p->ix, (int) *p->iy,
>                                  (int) *p->iwidth, (int) *p->iheight);
> -      //fl_window->resizable(o);
> -      o->box(FL_ENGRAVED_FRAME);
> -      o->spacing(15);
> +      Fl_Boxtype borderType;
> +      int iborder = (int)*p->iborder;
> +      // fl_window->resizable(o);
> +      if (iborder<0 || iborder>7)
> borderType = FL_FLAT_BOX;
> +      else borderType = BOX_TABLE[iborder];
> +      o->type((int)*p->itype);
> +      o->spacing((int)*p->ispace);
>  
>        ADDR_STACK adrstk(&p-
> >h,o,ST(stack_count));      
> ST(AddrStack).push_back(adrstk);@@ -5591,7 +5595,7 @@
>      (SUBR)
> EndScroll,               (SUBR) NULL,              (SUBR) NULL },
>    { (char*)"FLscroll_end",S(FLSCROLLEND), 
> 1,  (char*)"",     (char*)"",
>      (SUBR)
> EndScroll,               (SUBR) NULL,              (SUBR) NULL },
> -  { (char*)"FLpack",     
> S(FLPACK),       1, 
> (char*)"",     (char*)"iiii",
> +  { (char*)"FLpack",     
> S(FLPACK),       1, 
> (char*)"",     (char*)"iiiiiii",
>      (SUBR)
> StartPack,               (SUBR) NULL,              (SUBR) NULL },
>    { (char*)"FLpackEnd",  
> S(FLPACKEND),    1, 
> (char*)"",     (char*)"",
>      (SUBR)
> EndPack,                 (SUBR) NULL,              (SUBR) NULL },
> diff -ur csound5~/InOut/widgets.h csound5/InOut/widgets.h
> --- csound5~/InOut/widgets.h 2011-11-14 11:52:17.000000000 +0100
> +++ csound5/InOut/widgets.h 2011-12-05 22:43:12.000000000 +0100
> @@ -263,7 +263,7 @@
>  
>  typedef struct {
>      OPDS    h;
> -    MYFLT   *iwidth, *iheight, *ix, *iy;
> +    MYFLT   *iwidth, *iheight, *ix,
> *iy, *itype, *ispace, *iborder;
>  } FLPACK;
>  
>  typedef struct {
>
>
> tito
>
> -----------------------------------------------------------------
> -------------
> All the data continuously generated in your IT infrastructure
> contains a definitive record of customers, application
> performance,
> security threats, fraudulent activity, and more. Splunk takes
> this
> data and makes sense of it. IT sense. And common sense.
> http://p.sf.net/sfu/splunk-novd2d
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel

Dr Victor Lazzarini, Senior Lecturer, Dept. of Music,
National University of Ireland, Maynooth