Mercurial > octave
comparison libgui/graphics/ToggleButtonControl.h @ 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 |
comparison
equal
deleted
inserted
replaced
27646:2ff12b707f60 | 27647:2a506bc4a7af |
---|---|
28 class QPushButton; | 28 class QPushButton; |
29 | 29 |
30 namespace octave | 30 namespace octave |
31 { | 31 { |
32 class base_qobject; | 32 class base_qobject; |
33 class interpreter; | |
33 } | 34 } |
34 | 35 |
35 namespace QtHandles | 36 namespace QtHandles |
36 { | 37 { |
37 | 38 |
38 class ToggleButtonControl : public ButtonControl | 39 class ToggleButtonControl : public ButtonControl |
39 { | 40 { |
40 public: | 41 public: |
41 ToggleButtonControl (octave::base_qobject& oct_qobj, const graphics_object& go, | 42 ToggleButtonControl (octave::base_qobject& oct_qobj, |
42 QPushButton *box); | 43 octave::interpreter& interp, |
44 const graphics_object& go, QPushButton *box); | |
43 ~ToggleButtonControl (void); | 45 ~ToggleButtonControl (void); |
44 | 46 |
45 static ToggleButtonControl * create (octave::base_qobject& oct_qobj, | 47 static ToggleButtonControl * |
46 const graphics_object& go); | 48 create (octave::base_qobject& oct_qobj, octave::interpreter& interp, |
49 const graphics_object& go); | |
47 | 50 |
48 protected: | 51 protected: |
49 void update (int pId); | 52 void update (int pId); |
50 }; | 53 }; |
51 | 54 |