aboutsummaryrefslogtreecommitdiff
path: root/pd/src/g_editor.c
diff options
context:
space:
mode:
authorMiller Puckette <millerpuckette@users.sourceforge.net>2005-12-31 20:55:25 +0000
committerMiller Puckette <millerpuckette@users.sourceforge.net>2005-12-31 20:55:25 +0000
commitd68f8326740a6a8d0b97b00e774d23c1a5c336a2 (patch)
treefe4a64fcea60bd35d214ac6813cd598af97b87ef /pd/src/g_editor.c
parent1498e89f88d0a090a59ceb4cf19daf9d9c8963c5 (diff)
Took a bunch of patches... more to come but these are the ones that might break stuff so I'll sync here.
svn path=/trunk/; revision=4336
Diffstat (limited to 'pd/src/g_editor.c')
-rw-r--r--pd/src/g_editor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index 51372da9..0db0c140 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -1029,7 +1029,7 @@ static void canvas_done_popup(t_canvas *x, float which, float xpos, float ypos)
/* on one-button-mouse machines, you can use double click to
mean right click (which gets the popup menu.) Do this for Mac. */
-#ifdef MACOSX
+#ifdef __APPLE__
#define SIMULATERIGHTCLICK
#endif
@@ -1492,7 +1492,7 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
keyupsym = gensym("#keyup");
keynamesym = gensym("#keyname");
}
-#ifdef MACOSX
+#ifdef __APPLE__
if (keynum == 30)
keynum = 0, gotkeysym = gensym("Up");
else if (keynum == 31)