Commit d38b2cc7 authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master' of 62.20.65.89:/data1/git/pwr

parents 83fc3475 ef771f72
......@@ -12588,6 +12588,8 @@ int GeConfirm::action( grow_tObject object, glow_tEvent event)
}
if ( dyn->graph->confirm_cb) {
if ( grow_GetTranslate( dyn->graph->grow->ctx))
Lng::translate( text, text);
(dyn->graph->confirm_cb)( dyn->graph->parent_ctx,
object, text);
}
......
......@@ -4270,8 +4270,13 @@ int Graph::set_subwindow_source( const char *name, char *source, char *owner)
if ( grow_GetObjectType( object) != glow_eObjectType_GrowWindow)
return 0;
grow_EnableEvent( grow->ctx, glow_eEvent_Translate,
glow_eEventType_CallBack, graph_grow_cb);
sts = grow_SetWindowSource( object, source, owner);
grow_DisableEvent( grow->ctx, glow_eEvent_Translate);
if ( ctx != grow->ctx)
grow->pop(ctx);
......
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