[Gridflow-cvs] [svn] commit: r4853 - /trunk/src/classes2.cxx

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Tue Nov 10 23:43:06 EST 2009


Author: matju
Date: Tue Nov 10 23:43:05 2009
New Revision: 4853

Log:
#define DESIREDATA doesn't exist; both DESIRE and HAVE_DESIREDATA exist though

Modified:
    trunk/src/classes2.cxx

Modified: trunk/src/classes2.cxx
==============================================================================
--- trunk/src/classes2.cxx (original)
+++ trunk/src/classes2.cxx Tue Nov 10 23:43:05 2009
@@ -38,7 +38,7 @@
 
 typedef int (*comparator_t)(const void *, const void *);
 
-#ifndef DESIREDATA
+#ifndef DESIRE
 struct _outconnect {
     struct _outconnect *next;
     t_pd *to;
@@ -327,12 +327,12 @@
 }
 \end class {install("gf.print",1,0); add_creator3(fclass,"print");}
 
-#ifdef HAVE_DESIREDATA
+#ifdef DESIRE
 t_glist *glist_getcanvas(t_glist *foo) {return foo;}//dummy
 void canvas_fixlinesfor(t_glist *foo,t_text *) {}//dummy
 #endif
 
-//#ifdef HAVE_DESIREDATA
+//#ifdef DESIRE
 static void display_redraw(t_gobj *client, t_glist *glist);
 \class Display : FObject {
 	bool selected;
@@ -463,7 +463,7 @@
 	}\n");
 #endif
 }
-//#endif // ndef HAVE_DESIREDATA
+//#endif // ndef DESIRE
 
 //****************************************************************
 
@@ -854,7 +854,7 @@
 	((t_text *)m)->te_ypix = atom_getfloatarg(1,argc,argv);
 	t_canvas *granny = m->gl_owner;
 	if (!granny) RAISE("no such canvas");
-#ifdef DESIREDATA
+#ifdef DESIRE
 	gobj_changed(m);
 #else
         gobj_vis((t_gobj *)m,granny,0);
@@ -968,7 +968,7 @@
 	for (int i=0; i<n; i++) {ouch = ouch->next; if (!ouch) {RAISE("no such outlet");}}
 #define wire_each(wire,ouchlet) for (t_outconnect *wire = ouchlet->connections; wire; wire=wire->next)
 \def 0 wire_dotted (int r, int g, int b) {
-#ifndef DESIREDATA
+#ifndef DESIRE
 	BEGIN
 	wire_each(wire,ouch) {
 		sys_vgui(".x%lx.c itemconfigure l%lx -fill #%02x%02x%02x -dash {3 3 3 3}\n",long(can),long(wire),r,g,b);
@@ -978,7 +978,7 @@
 #endif
 }
 \def 0 wire_hide () {
-#ifndef DESIREDATA
+#ifndef DESIRE
 	BEGIN
 	wire_each(wire,ouch) sys_vgui(".x%lx.c delete l%lx\n",long(can),long(wire));
 #else
@@ -986,7 +986,7 @@
 #endif
 }
 \def 0 box_dotted (int r, int g, int b) {
-#ifndef DESIREDATA
+#ifndef DESIRE
 	BEGIN
 	wire_each(wire,ouch) {
 		t_object *t = (t_object *)wire->to;
@@ -1022,7 +1022,7 @@
 	bool horiz;
 	if (dir==&s_x) horiz=false; else
 	if (dir==&s_y) horiz=true;  else RAISE("$1 must be x or y");
-#ifndef DESIREDATA
+#ifndef DESIRE
 	std::vector<t_object *> v;
 	BEGIN
 	wire_each(wire,ouch) {
@@ -1052,7 +1052,7 @@
 #endif
 }
 
-#ifndef DESIREDATA
+#ifndef DESIRE
 extern t_widgetbehavior text_widgetbehavior;
 t_widgetbehavior text_widgetbehavi0r;
 
@@ -1075,7 +1075,7 @@
 
 \end class {
 	install("gf/lol",1,1);
-#ifndef DESIREDATA
+#ifndef DESIRE
 	class_setpropertiesfn(text_class,(t_propertiesfn)0xDECAFFED);
 	unsigned long *lol = (unsigned long *)text_class;
 	int i=0;



More information about the Gridflow-cvs mailing list