Commit 42dfb2ee authored by Claes Sjofors's avatar Claes Sjofors

Ge emit signal with 'set subwindow' fix

parent 4a33bbf0
......@@ -4259,9 +4259,15 @@ static int graph_trace_grow_cb( GlowCtx *ctx, glow_tEvent event)
if ( grow_GetObjectType( event->signal.object) == glow_eObjectType_GrowNode ||
grow_GetObjectType( event->signal.object) == glow_eObjectType_GrowGroup) {
GeDyn *dyn;
int sts;
grow_GetUserData( event->signal.object, (void **)&dyn);
dyn->action( event->signal.object, event);
sts = dyn->action( event->signal.object, event);
if ( sts == GLOW__TERMINATED || sts == GLOW__SUBTERMINATED) {
if ( ctx_popped)
graph->grow->push();
return GLOW__NO_PROPAGATE;
}
}
break;
}
......
......@@ -2484,7 +2484,7 @@ int GlowDrawGtk::set_clip_rectangle( GlowWind *wind,
{
DrawWindGtk *w = (DrawWindGtk *) wind->window;
if ( w->clip_cnt >= DRAW_CLIP_SIZE) {
printf("** Draw clip refuced\n");
printf("** Draw clip refused\n");
return 0;
}
int x0, x1, y0, y1;
......
......@@ -110,7 +110,7 @@ GrowCtx::~GrowCtx()
free( dynamic);
if ( gdraw && ctx_type == glow_eCtxType_Grow && customcolors) {
gdraw->reset_customcolors( customcolors);
free( customcolors);
delete customcolors;
}
}
......
......@@ -92,7 +92,7 @@ void GrowGroup::copy_from( const GrowGroup& n)
dynamic = (char *) calloc( 1, n.dynamicsize);
memcpy( dynamic, n.nc->dynamic, n.dynamicsize);
}
// Get unic name
// Get unique name
sprintf( n_name, "Grp%d_", ((GrowCtx *)ctx)->objectname_cnt++);
nc = new GlowNodeGroup( (GlowNodeGroup &)*n.nc);
......
......@@ -696,6 +696,7 @@ int GrowWindow::event_handler( GlowWind *w, glow_eEvent event, int x, int y, dou
return sts;
else if (sts == GLOW__SUBTERMINATED) {
ctx->gdraw->pop_customcolors();
ctx->gdraw->reset_clip_rectangle( &ctx->mw);
return 1;
}
......
......@@ -60,7 +60,7 @@ GlowNodeGroup::GlowNodeGroup( GrowCtx *glow_ctx, const char *name)
GlowNodeGroup::GlowNodeGroup( const GlowNodeGroup& nc)
: GlowNodeClass( (GlowNodeClass &)nc)
{
// Get unic name
// Get unique name
sprintf( nc_name, "Grp%d_", ((GrowCtx *)ctx)->objectname_cnt++);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment