Mercurial > octave
diff libgui/graphics/ButtonControl.cc @ 27647:2a506bc4a7af
eliminate global access to Octave interpreter in qt graphics classes
Provide reference to interprerter to qt graphics classes to
eliminate need for accessing it through a global variable.
* qt-graphics-toolkit.cc (qt_graphics_toolkit::create_object): Pass
m_interpreter to create functions for individual graphics objects.
* BaseControl.h, BaseControl.cc, ButtonControl.h, ButtonControl.cc,
ButtonGroup.h, ButtonGroup.cc, Canvas.h, Canvas.cc, CheckBoxControl.h,
CheckBoxControl.cc, Container.h, Container.cc, ContextMenu.h,
ContextMenu.cc, EditControl.h, EditControl.cc, Figure.h, Figure.cc,
GLCanvas.h, GLCanvas.cc, ListBoxControl.h, ListBoxControl.cc, Menu.h,
Menu.cc, Object.h, Object.cc, Panel.h, Panel.cc, PopupMenuControl.h,
PopupMenuControl.cc, PushButtonControl.h, PushButtonControl.cc,
PushTool.h, PushTool.cc, QtHandlesUtils.h, RadioButtonControl.h,
RadioButtonControl.cc, SliderControl.h, SliderControl.cc, Table.h,
Table.cc, TextControl.h, TextControl.cc, ToggleButtonControl.h,
ToggleButtonControl.cc, ToggleTool.h, ToggleTool.cc, ToolBar.h,
ToolBar.cc, ToolBarButton.h, ToolBarButton.cc:
Accept reference to interpreter in create function and constructors
for graphics objects. Eliminate global access to interpreter object
and graphics_handle manager.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 06 Nov 2019 12:42:12 -0500 |
parents | 028205a91a07 |
children | b442ec6dda5c |
line wrap: on
line diff
--- a/libgui/graphics/ButtonControl.cc Tue Nov 05 18:23:20 2019 -0500 +++ b/libgui/graphics/ButtonControl.cc Wed Nov 06 12:42:12 2019 -0500 @@ -32,15 +32,16 @@ #include "QtHandlesUtils.h" #include "graphics.h" -#include "interpreter-private.h" +#include "interpreter.h" namespace QtHandles { ButtonControl::ButtonControl (octave::base_qobject& oct_qobj, + octave::interpreter& interp, const graphics_object& go, QAbstractButton *btn) - : BaseControl (oct_qobj, go, btn), m_blockCallback (false) + : BaseControl (oct_qobj, interp, go, btn), m_blockCallback (false) { uicontrol::properties& up = properties<uicontrol> (); @@ -97,9 +98,9 @@ btn->setChecked (false); if (up.style_is ("radiobutton") || up.style_is ("togglebutton")) { - gh_manager& gh_mgr = octave::__get_gh_manager__ ("ButtonControl::update"); + gh_manager& gh_mgr = m_interpreter.get_gh_manager (); - Object *parent = Object::parentObject (gh_mgr.get_object (up.get___myhandle__ ())); + Object *parent = Object::parentObject (m_interpreter, gh_mgr.get_object (up.get___myhandle__ ())); ButtonGroup *btnGroup = dynamic_cast<ButtonGroup *>(parent); if (btnGroup) btnGroup->selectNothing (); @@ -125,7 +126,7 @@ if (! m_blockCallback && btn->isCheckable ()) { - gh_manager& gh_mgr = octave::__get_gh_manager__ ("ButtonControl::toggled"); + gh_manager& gh_mgr = m_interpreter.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ());