Commit b6e97df4 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

Merge branch 'master' of git://github.com/pd-l2ork/pd

parents 11d50425 357ad7e6
......@@ -260,9 +260,8 @@ void iemgui_label_font(t_iemgui *x, t_symbol *s, int ac, t_atom *av)
if(glist_isvisible(x->x_glist))
{
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font %s\n",
glist_getcanvas(x->x_glist), x, iemgui_font(x),
x->x_fontsize, sys_fontweight);
iemgui_shouldvis(x, IEM_GUI_DRAW_MODE_CONFIG);
glist_getcanvas(x->x_glist), x, iemgui_font(x));
iemgui_shouldvis(x, IEM_GUI_DRAW_MODE_CONFIG);
}
}
......
......@@ -5243,7 +5243,7 @@ static void plot_vis(t_gobj *z, t_glist *glist, t_glist *parentglist,
"-matrix {{1.0 0.0} {0.0 1.0} {%g %g}} ",
glist_getcanvas(glist), elemtemplatecanvas,
(t_word *)(elem + elemsize * i),
x->x_canvas, data, usexloc, useyloc);
usexloc, useyloc);
if (in_array)
{
sys_vgui("-parent {.scelem%lx.%lx}\n", parentglist, data);
......
......@@ -13,7 +13,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42
#define PD_BUGFIX_VERSION 7
#define PD_TEST_VERSION "20140813"
#define PD_TEST_VERSION "20140814"
#define PDL2ORK
/* old name for "MSW" flag -- we have to take it for the sake of many old
......@@ -648,9 +648,8 @@ typedef void (*t_guicallbackfn)(t_gobj *client, t_glist *glist);
EXTERN void sys_vgui(const char *fmt, ...)
__attribute__((format(printf,1,2)));
EXTERN void sys_vguid(const char *file, int line, const char *fmt, ...)
__attribute__((format(printf,1,2)));
EXTERN void sys_vvguid(const char *file, int line, const char *fmt, va_list)
__attribute__((format(printf,3,4)));
EXTERN void sys_vvguid(const char *file, int line, const char *fmt, va_list);
#else
EXTERN void sys_vgui(const char *fmt, ...);
EXTERN void sys_vguid(const char *file, int line, const char *fmt, ...);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment