diff options
| author | Guenter Geiger <ggeiger@users.sourceforge.net> | 2002-12-09 18:30:29 +0000 |
|---|---|---|
| committer | Guenter Geiger <ggeiger@users.sourceforge.net> | 2002-12-09 18:30:29 +0000 |
| commit | 011312406096edae98aeb079a12932f2b720e10b (patch) | |
| tree | 862b717c3b0a7a8fd575301f223df2dc0e68291f /pd/src/g_canvas.c | |
| parent | b28e8e9e7aea1451a7bd5946dc3e4331e44ba514 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r284,
which included commits to RCS files with non-trunk default branches.
svn path=/trunk/; revision=285
Diffstat (limited to 'pd/src/g_canvas.c')
| -rw-r--r-- | pd/src/g_canvas.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pd/src/g_canvas.c b/pd/src/g_canvas.c index 8bad09a9..1eba8ac5 100644 --- a/pd/src/g_canvas.c +++ b/pd/src/g_canvas.c @@ -38,7 +38,7 @@ struct _canvasenvironment #define GLIST_DEFCANVASHEIGHT 300 #ifdef MACOSX -#define GLIST_DEFCANVASYLOC 20 +#define GLIST_DEFCANVASYLOC 22 #else #define GLIST_DEFCANVASYLOC 0 #endif @@ -186,8 +186,6 @@ void canvas_getargs(int *argcp, t_atom **argvp) *argvp = e->ce_argv; } -t_symbol *realizedollsym(t_symbol *s, int ac, t_atom *av, int tonew); - t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s) { t_symbol *ret; @@ -196,7 +194,8 @@ t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s) { t_canvasenvironment *env = canvas_getenv(x); canvas_setcurrent(x); - ret = realizedollsym(gensym(name+1), env->ce_argc, env->ce_argv, 1); + ret = binbuf_realizedollsym(gensym(name+1), + env->ce_argc, env->ce_argv, 1); canvas_unsetcurrent(x); } else ret = s; @@ -397,6 +396,10 @@ t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv) } else x->gl_env = 0; + if (yloc < GLIST_DEFCANVASYLOC) + yloc = GLIST_DEFCANVASYLOC; + if (xloc < 0) + xloc = 0; x->gl_x1 = 0; x->gl_y1 = 0; x->gl_x2 = 1; @@ -957,7 +960,7 @@ void canvas_restore(t_canvas *x, t_symbol *s, int argc, t_atom *argv) if (ap->a_type == A_DOLLSYM) { t_canvasenvironment *e = canvas_getenv(canvas_getcurrent()); - canvas_rename(x, realizedollsym(ap->a_w.w_symbol, + canvas_rename(x, binbuf_realizedollsym(ap->a_w.w_symbol, e->ce_argc, e->ce_argv, 1), 0); } else if (ap->a_type == A_SYMBOL) |