diff options
| -rwxr-xr-x | gui/slider.c | 1 | ||||
| -rwxr-xr-x | gui/ticker.c | 1 | ||||
| -rwxr-xr-x | gui/toddle.c | 7 | ||||
| -rwxr-xr-x | gui/w_envgen.h | 16 | ||||
| -rwxr-xr-x | include/ggee.h | 4 |
5 files changed, 14 insertions, 15 deletions
diff --git a/gui/slider.c b/gui/slider.c index fdb0613..06f9637 100755 --- a/gui/slider.c +++ b/gui/slider.c @@ -1,6 +1,5 @@ #include <m_pd.h> #include "g_canvas.h" -#include <ggee.h> #ifdef NT #pragma warning( disable : 4244 ) diff --git a/gui/ticker.c b/gui/ticker.c index 57a1bfd..f3ed4e9 100755 --- a/gui/ticker.c +++ b/gui/ticker.c @@ -1,6 +1,5 @@ #include <m_pd.h> #include "g_canvas.h" -#include <ggee.h> #ifdef NT #pragma warning( disable : 4244 ) diff --git a/gui/toddle.c b/gui/toddle.c index 4b46e8d..e7541a6 100755 --- a/gui/toddle.c +++ b/gui/toddle.c @@ -3,13 +3,16 @@ #include <m_pd.h>
#include "g_canvas.h"
-#include <ggee.h>
#ifdef NT
#pragma warning( disable : 4244 )
#pragma warning( disable : 4305 )
#endif
+#define PD_VERSION_MINOR 32
+#define BACKGROUND "-fill grey"
+#define BACKGROUNDCOLOR "grey"
+
#define te_xpos te_xpix
#define te_ypos te_ypix
@@ -313,7 +316,7 @@ void toddle_color(t_toddle* x,t_symbol* col) */
}
-static void toddle_setwidget()
+static void toddle_setwidget(void)
{
toddle_widgetbehavior.w_getrectfn = toddle_getrect;
toddle_widgetbehavior.w_displacefn = toddle_displace;
diff --git a/gui/w_envgen.h b/gui/w_envgen.h index b815d6c..88c0c6b 100755 --- a/gui/w_envgen.h +++ b/gui/w_envgen.h @@ -7,7 +7,9 @@ #define abs fabs
#endif
-#include "ggee.h"
+#define PD_VERSION_MINOR 32
+#define BACKGROUND "-fill grey"
+#define BACKGROUNDCOLOR "grey"
#define BORDER 2
#if 0 /* backwards compatiblity */
@@ -126,12 +128,12 @@ static void envgen_create_doodles(t_envgen *x, t_glist *glist) xpos = x->x_obj.te_xpix;
ypos = (int) (x->x_obj.te_ypix + x->w.height);
for (i=0;i<=x->last_state;i++) {
- sprintf(guistr,".x%x.c create oval %d %d %d %d -tags %xD%d",glist_getcanvas(glist),
+ sprintf(guistr,".x%x.c create oval %d %d %d %d -tags %xD%d",(unsigned int)glist_getcanvas(glist),
(int) (xpos+(x->duration[i] * xscale) - 2),
(int) (ypos - x->finalvalues[i]*yscale - 2),
(int) (xpos+(x->duration[i] * xscale)+2),
(int) (ypos - x->finalvalues[i]*yscale + 2),
- x,i);
+ (unsigned int)x,i);
if (i == x->w.grabbed) strcat(guistr," -fill red\n");
else strcat(guistr,"\n");
@@ -175,7 +177,7 @@ static void envgen_create(t_envgen *x, t_glist *glist) xscale = x->w.width/x->duration[x->last_state];
yscale = x->w.height;
- sprintf(buf,".x%x.c create line",glist_getcanvas(glist));
+ sprintf(buf,".x%x.c create line",(unsigned int)glist_getcanvas(glist));
xpos = x->x_obj.te_xpix;
ypos = (int) (x->x_obj.te_ypix + x->w.height);
for (i=0;i<=x->last_state;i++) {
@@ -184,7 +186,7 @@ static void envgen_create(t_envgen *x, t_glist *glist) strcat(buf,num);
}
- sprintf(num,"-tags %xP\n",x);
+ sprintf(num,"-tags %xP\n",(unsigned int)x);
strcat(buf,num);
/* post("sending %s",buf); */
sys_vgui("%s",buf);
@@ -210,7 +212,7 @@ int i; xscale = x->w.width/x->duration[x->last_state];
yscale = x->w.height;
- sprintf(buf,".x%x.c coords %xP",glist_getcanvas(glist),x);
+ sprintf(buf,".x%x.c coords %xP",(unsigned int)glist_getcanvas(glist),x);
xpos = x->x_obj.te_xpix;
ypos = (int) (x->x_obj.te_ypix + x->w.height);
for (i=0;i<=x->last_state;i++) {
@@ -434,7 +436,7 @@ static int envgen_newclick(t_gobj *z, struct _glist *glist, t_widgetbehavior envgen_widgetbehavior;
-void envgen_setwidget()
+void envgen_setwidget(void)
{
envgen_widgetbehavior.w_getrectfn = envgen_getrect;
envgen_widgetbehavior.w_displacefn = envgen_displace;
diff --git a/include/ggee.h b/include/ggee.h index 6882454..39af5dc 100755 --- a/include/ggee.h +++ b/include/ggee.h @@ -2,10 +2,6 @@ #define __GGEXT_H__
-
-#define BACKGROUND "-fill grey"
-#define BACKGROUNDCOLOR "grey"
-
#ifndef PD_VERSION_MINOR
#define PD_VERSION_MINOR 32
#endif
|