Blob Blame History Raw
--- Csound5.12.1/InOut/widgets.cpp.orig	2010-12-27 00:26:43.887343302 +0000
+++ Csound5.12.1/InOut/widgets.cpp	2010-12-27 00:27:40.589546414 +0000
@@ -2999,7 +2999,7 @@
       return OK;
   }
 
-  static int fl_box_(CSOUND *csound, FL_BOX *p)
+  static int fl_boxthing_(CSOUND *csound, FL_BOX *p)
   {
       char *text = GetString(csound, p->itext, p->XSTRCODE);
       Fl_Box *o =  new Fl_Box((int)*p->ix, (int)*p->iy,
@@ -5570,7 +5570,7 @@
   { (char*)"FLsetAlign",  S(FL_TALIGN),    1,  (char*)"",     (char*)"ii",
     (SUBR) fl_align,                (SUBR) NULL,              (SUBR) NULL },
   { (char*)"FLbox",       S(FL_BOX),       1,  (char*)"i",    (char*)"Tiiiiiii",
-    (SUBR) fl_box_,                  (SUBR) NULL,              (SUBR) NULL },
+    (SUBR) fl_boxthing_,                  (SUBR) NULL,              (SUBR) NULL },
   { (char*)"FLvalue",     S(FLVALUE),      1,  (char*)"i",    (char*)"Tjjjj",
     (SUBR) fl_value,                (SUBR) NULL,              (SUBR) NULL },
   { (char*)"FLpanel",     S(FLPANEL),      1,  (char*)"",     (char*)"Tjjjoooo",
--- Csound5.12.1/SConstruct.orig	2010-12-27 00:29:34.223885014 +0000
+++ Csound5.12.1/SConstruct	2010-12-27 00:29:42.753607024 +0000
@@ -259,7 +259,7 @@
     '0')
 commandOptions.Add('tclversion',
     'Set to 8.4 or 8.5',
-    '8.4')
+    '8.5')
 commandOptions.Add('includeMP3',
      'Set to 1 if using mpadec', 
      '0')