Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Aayush
purr-data
Commits
55dab80b
Commit
55dab80b
authored
Jan 26, 2019
by
Jonathan Wilkes
Browse files
Merge branch 'fix-function-sigs'
parents
81baca60
ca828514
Changes
2
Hide whitespace changes
Inline
Side-by-side
pd/src/g_canvas.c
View file @
55dab80b
...
...
@@ -2520,7 +2520,7 @@ extern void glist_scalar(t_glist *canvas, t_symbol *s, int argc, t_atom *argv);
void
g_graph_setup
(
void
);
void
g_editor_setup
(
void
);
void
g_readwrite_setup
(
void
);
extern
void
canvas_properties
(
t_gobj
*
z
);
extern
void
canvas_properties
(
t_gobj
*
z
,
t_glist
*
dummy
);
void
g_canvas_setup
(
void
)
{
...
...
pd/src/g_editor.c
View file @
55dab80b
...
...
@@ -2652,8 +2652,9 @@ int garray_properties(t_garray *x, t_symbol **gfxstubp, t_symbol **namep,
/* tell GUI to create a properties dialog on the canvas. We tell
the user the negative of the "pixel" y scale to make it appear to grow
naturally upward, whereas pixels grow downward. */
void
canvas_properties
(
t_glist
*
x
)
void
canvas_properties
(
t_gobj
*
z
,
t_glist
*
dummy
)
{
t_glist
*
x
=
(
t_glist
*
)
z
;
t_gobj
*
y
;
//char graphbuf[200];
char
*
gfx_tag
;
...
...
@@ -3124,7 +3125,7 @@ void canvas_done_popup(t_canvas *x, t_float which, t_float xpos,
{
if
(
!
x
->
gl_edit
)
canvas_editmode
(
x
,
1
);
canvas_properties
(
x
);
canvas_properties
(
(
t_gobj
*
)
x
,
x
);
}
else
if
(
which
==
2
)
open_via_helppath
(
"intro.pd"
,
canvas_getdir
((
t_canvas
*
)
x
)
->
s_name
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment