Mercurial > octave
changeset 29223:5aa787452544
Use Octave map instead of octave_struct in gui graphics (patch #8919).
* libgui/graphics/ButtonGroup.cc, libgui/graphics/Table.cc: Use Octave map
instead of octave_struct.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 16 Dec 2020 01:05:17 -0500 |
parents | c7b27a4a6b43 |
children | cc4a4df4e32f |
files | libgui/graphics/ButtonGroup.cc libgui/graphics/Table.cc |
diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/ButtonGroup.cc Wed Dec 30 10:53:16 2020 -0800 +++ b/libgui/graphics/ButtonGroup.cc Wed Dec 16 01:05:17 2020 -0500 @@ -48,7 +48,7 @@ #include "octave-qobject.h" #include "interpreter.h" -#include "ov-struct.h" +#include "oct-map.h" namespace QtHandles { @@ -520,7 +520,7 @@ eventData.setfield ("NewValue", newValue.as_octave_value ()); eventData.setfield ("Source", bp.get___myhandle__ ().as_octave_value ()); eventData.setfield ("EventName", "SelectionChanged"); - octave_value selectionChangedEventObject (new octave_struct (eventData)); + octave_value selectionChangedEventObject (eventData); emit gh_callback_event (m_handle, "selectionchangedfcn", selectionChangedEventObject); }
--- a/libgui/graphics/Table.cc Wed Dec 30 10:53:16 2020 -0800 +++ b/libgui/graphics/Table.cc Wed Dec 16 01:05:17 2020 -0500 @@ -52,10 +52,10 @@ #include "graphics.h" #include "interpreter.h" +#include "oct-map.h" #include "oct-stream.h" #include "oct-string.h" #include "oct-strstrm.h" -#include "ov-struct.h" namespace QtHandles { @@ -503,8 +503,7 @@ } octave_scalar_map eventData; eventData.setfield ("Indices", indices); - octave_value cellSelectionCallbackEventObject = - octave_value (new octave_struct (eventData)); + octave_value cellSelectionCallbackEventObject (eventData); emit gh_callback_event (m_handle, "cellselectioncallback", cellSelectionCallbackEventObject); } @@ -551,8 +550,7 @@ eventData.setfield ("EditData", edit_data); eventData.setfield ("Error", error); - octave_value cellEditCallbackEventObject = - octave_value (new octave_struct (eventData)); + octave_value cellEditCallbackEventObject (eventData); emit gh_callback_event (m_handle, "celleditcallback", cellEditCallbackEventObject);