Commit 9f040483 authored by Claes Sjofors's avatar Claes Sjofors

Xtt crossreference window, segfault at double click fixed

parent 7437ee2a
...@@ -47,3 +47,4 @@ nonextsibling <There is no next sibling> /error ...@@ -47,3 +47,4 @@ nonextsibling <There is no next sibling> /error
destroyed <Flow ctx is destroyed> /info destroyed <Flow ctx is destroyed> /info
no_propagate <Don't propagate event handling> /info no_propagate <Don't propagate event handling> /info
fileopen <Unable to open file> /error fileopen <Unable to open file> /error
terminated <Ctx is terminated> /info
...@@ -763,7 +763,10 @@ int FlowDrawGtk::event_handler( FlowCtx *ctx, GdkEvent event) ...@@ -763,7 +763,10 @@ int FlowDrawGtk::event_handler( FlowCtx *ctx, GdkEvent event)
sts = ctx->event_handler( flow_eEvent_MB1DoubleClickShiftCtrl, (int)event.button.x, (int)event.button.y, 0, 0); sts = ctx->event_handler( flow_eEvent_MB1DoubleClickShiftCtrl, (int)event.button.x, (int)event.button.y, 0, 0);
else else
sts = ctx->event_handler( flow_eEvent_MB1DoubleClick, (int)event.button.x, (int)event.button.y, 0, 0); sts = ctx->event_handler( flow_eEvent_MB1DoubleClick, (int)event.button.x, (int)event.button.y, 0, 0);
if ( sts == FLOW__TERMINATED)
return sts;
click_sensitivity = 0; click_sensitivity = 0;
break; break;
case 2: // Button2 case 2: // Button2
if ( (event.button.state & GDK_SHIFT_MASK) && if ( (event.button.state & GDK_SHIFT_MASK) &&
...@@ -2013,4 +2016,4 @@ FlowPrintDraw *FlowDrawGtk::print_draw_new( void *context, const char *title, in ...@@ -2013,4 +2016,4 @@ FlowPrintDraw *FlowDrawGtk::print_draw_new( void *context, const char *title, in
FlowPrintDrawGtk *pd = new FlowPrintDrawGtk( context, title, page, flow_ctx, FlowPrintDrawGtk *pd = new FlowPrintDrawGtk( context, title, page, flow_ctx,
page_border, sts); page_border, sts);
return (FlowPrintDraw *)pd; return (FlowPrintDraw *)pd;
} }
\ No newline at end of file
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "flow.h" #include "flow.h"
#include "flow_browctx.h" #include "flow_browctx.h"
#include "flow_browapi.h" #include "flow_browapi.h"
#include "flow_msg.h"
#include "xtt_xatt.h" #include "xtt_xatt.h"
#include "xtt_xattnav.h" #include "xtt_xattnav.h"
...@@ -473,7 +474,7 @@ int XAttNav::brow_cb( FlowCtx *ctx, flow_tEvent event) ...@@ -473,7 +474,7 @@ int XAttNav::brow_cb( FlowCtx *ctx, flow_tEvent event)
((ItemCrossref *)item)->ref_name); ((ItemCrossref *)item)->ref_name);
if ( xattnav->close_cb) { if ( xattnav->close_cb) {
(xattnav->close_cb)( xattnav->parent_ctx); (xattnav->close_cb)( xattnav->parent_ctx);
return 1; return FLOW__TERMINATED;
} }
} }
break; break;
...@@ -953,4 +954,4 @@ void XAttNav::zoom( double zoom_factor) ...@@ -953,4 +954,4 @@ void XAttNav::zoom( double zoom_factor)
void XAttNav::unzoom() void XAttNav::unzoom()
{ {
brow_UnZoom( brow->ctx); brow_UnZoom( brow->ctx);
} }
\ No newline at end of file
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