Commit e2af5336 authored by Claes Sjofors's avatar Claes Sjofors

Multiview MB3 close disabled for ge cells

parent 591af1b4
......@@ -3810,8 +3810,8 @@ static int graph_trace_grow_cb( GlowCtx *ctx, glow_tEvent event)
case glow_eMB3Action_Both:
// Close
if ( graph->close_cb) {
(graph->close_cb)( graph->parent_ctx);
return GLOW__TERMINATED;
if ( (graph->close_cb)( graph->parent_ctx))
return GLOW__TERMINATED;
}
break;
default:
......@@ -4024,8 +4024,8 @@ static int graph_trace_grow_cb( GlowCtx *ctx, glow_tEvent event)
if ( event->key.ascii == 23) {
// Ctrl W, close graph
if ( graph->close_cb) {
(graph->close_cb)( graph->parent_ctx);
return GLOW__TERMINATED;
if ( (graph->close_cb)( graph->parent_ctx))
return GLOW__TERMINATED;
}
}
if ( event->object.object_type != glow_eObjectType_NoObject) {
......
......@@ -453,7 +453,7 @@ class Graph {
void (*message_cb)( void *, char, const char *);
int (*get_current_subgraph_cb)( void *, char *, char *);
void (*close_cb)( void *);
int (*close_cb)( void *);
void (*get_current_colors_cb)( void *, glow_eDrawType *, glow_eDrawType *, glow_eDrawType *);
void (*set_current_colors_cb)( void *, glow_eDrawType, glow_eDrawType, glow_eDrawType);
void (*init_cb)( void *);
......
......@@ -84,10 +84,15 @@ void XttGe::graph_init_cb( void *client_data)
}
void XttGe::graph_close_cb( void *client_data)
int XttGe::graph_close_cb( void *client_data)
{
XttGe *ge = (XttGe *) client_data;
if ( ge->options & ge_mOptions_Embedded)
return 0;
delete ge;
return 1;
}
int XttGe::ge_command_cb( void *ge_ctx, char *cmd)
......
......@@ -97,7 +97,7 @@ class XttGe {
void event_exec( int type, void *event, unsigned int size);
static void graph_init_cb( void *client_data);
static void graph_close_cb( void *client_data);
static int graph_close_cb( void *client_data);
static int ge_command_cb( void *ge_ctx, char *command);
static int ge_sound_cb( void *ge_ctx, pwr_tAttrRef *aref);
static void ge_display_in_xnav_cb( void *ge_ctx, pwr_sAttrRef *arp);
......
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