comparison libgui/graphics/BaseControl.cc @ 31647:431f80aba37a

maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 15:37:43 -0500
parents ca7d58406f82 c6d54dd31a7e
children deb553ac2c54
comparison
equal deleted inserted replaced
31645:bd9da634f00d 31647:431f80aba37a
37 #include "QtHandlesUtils.h" 37 #include "QtHandlesUtils.h"
38 38
39 #include "graphics.h" 39 #include "graphics.h"
40 #include "interpreter.h" 40 #include "interpreter.h"
41 41
42 namespace octave 42 OCTAVE_BEGIN_NAMESPACE(octave)
43 {
44 43
45 static void 44 static void
46 updatePalette (const uicontrol::properties& props, QWidget *w) 45 updatePalette (const uicontrol::properties& props, QWidget *w)
47 { 46 {
48 QPalette p = w->palette (); 47 QPalette p = w->palette ();
337 } 336 }
338 337
339 return Object::eventFilter (watched, xevent); 338 return Object::eventFilter (watched, xevent);
340 } 339 }
341 340
342 } 341 OCTAVE_END_NAMESPACE(octave)