Mercurial > octave
diff libinterp/dldfcn/__init_fltk__.cc @ 19013:60e54be64f37
Fix ginput for FLTK toolkit
* __init_fltk__.cc: Execute callback for base_properties::buttondownfcn
and figure_properties::buttondownfcn. Now it is possible to
have different callbacks for each axes in a subplot.
* __fltk_ginput__.m: Adapt to recent FLTK toolkit changes
| author | Andreas Weber <andy.weber.aw@gmail.com> |
|---|---|
| date | Sat, 16 Aug 2014 22:59:44 +0200 |
| parents | 7f73293d8423 |
| children | d74cdfc5d5c3 |
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc Sat Aug 16 19:08:52 2014 +0200 +++ b/libinterp/dldfcn/__init_fltk__.cc Sat Aug 16 22:59:44 2014 +0200 @@ -1133,6 +1133,7 @@ { if (!fp.is_beingdeleted ()) { + // FIXME: consider figures units property Matrix pos (1,2,0); pos(0) = px; pos(1) = h () - (py + status_h + menu_dy ()); @@ -1443,8 +1444,14 @@ fp.set_currentobject (ax_obj.get_handle ().value ()); + base_properties& props = ax_obj.get_properties (); + if (props.get_buttondownfcn ().is_defined ()) + props.execute_buttondownfcn (Fl::event_button ()); + return 1; } + else if (fp.get_buttondownfcn ().is_defined ()) + fp.execute_buttondownfcn (Fl::event_button ()); break;