Mercurial > octave-nkf

comparison libgui/graphics/Container.cc @ 20002:3cc0734283dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes in Qt graphics code * Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc: Follow a few more Octave coding conventions.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Mar 2015 12:27:54 -0400
parents b6061813a693
children f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
45 45
46 Container::~Container (void) 46 Container::~Container (void)
47 { 47 {
48 } 48 }
49 49
50 Canvas* Container::canvas (const graphics_handle& gh, bool xcreate) 50 Canvas*
51 Container::canvas (const graphics_handle& gh, bool xcreate)
51 { 52 {
52 if (! m_canvas && xcreate) 53 if (! m_canvas && xcreate)
53 { 54 {
54 gh_manager::auto_lock lock; 55 gh_manager::auto_lock lock;
55 graphics_object go = gh_manager::get_object (gh); 56 graphics_object go = gh_manager::get_object (gh);
70 } 71 }
71 72
72 return m_canvas; 73 return m_canvas;
73 } 74 }
74 75
75 void Container::resizeEvent (QResizeEvent* /* event */) 76 void
77 Container::resizeEvent (QResizeEvent* /* event */)
76 { 78 {
77 if (m_canvas) 79 if (m_canvas)
78 m_canvas->qWidget ()->setGeometry (0, 0, width (), height ()); 80 m_canvas->qWidget ()->setGeometry (0, 0, width (), height ());
79 81
80 gh_manager::auto_lock lock; 82 gh_manager::auto_lock lock;
95 } 97 }
96 } 98 }
97 } 99 }
98 } 100 }
99 101
100 void Container::childEvent (QChildEvent* xevent) 102 void
103 Container::childEvent (QChildEvent* xevent)
101 { 104 {
102 if (xevent->child ()->isWidgetType ()) 105 if (xevent->child ()->isWidgetType ())
103 { 106 qobject_cast<QWidget*> (xevent->child ())->setMouseTracking (hasMouseTracking ());
104 qobject_cast<QWidget*> (xevent->child ())->setMouseTracking (hasMouseTracking ());
105 }
106 } 107 }
107 108
108 }; // namespace QtHandles 109 }; // namespace QtHandles