comparison libgui/graphics/ButtonGroup.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
48 #include "octave-qtutils.h" 48 #include "octave-qtutils.h"
49 49
50 #include "interpreter.h" 50 #include "interpreter.h"
51 #include "oct-map.h" 51 #include "oct-map.h"
52 52
53 namespace octave 53 OCTAVE_BEGIN_NAMESPACE(octave)
54 {
55 54
56 static int 55 static int
57 frameStyleFromProperties (const uibuttongroup::properties& pp) 56 frameStyleFromProperties (const uibuttongroup::properties& pp)
58 { 57 {
59 if (pp.bordertype_is ("none")) 58 if (pp.bordertype_is ("none"))
458 ButtonGroup::selectNothing (void) 457 ButtonGroup::selectNothing (void)
459 { 458 {
460 m_hiddenbutton->setChecked (true); 459 m_hiddenbutton->setChecked (true);
461 } 460 }
462 461
463
464 void 462 void
465 ButtonGroup::addButton (QAbstractButton *btn) 463 ButtonGroup::addButton (QAbstractButton *btn)
466 { 464 {
467 m_buttongroup->addButton (btn); 465 m_buttongroup->addButton (btn);
468 connect (btn, &QAbstractButton::toggled, this, &ButtonGroup::buttonToggled); 466 connect (btn, &QAbstractButton::toggled, this, &ButtonGroup::buttonToggled);
525 emit gh_callback_event (m_handle, "selectionchangedfcn", 523 emit gh_callback_event (m_handle, "selectionchangedfcn",
526 selectionChangedEventObject); 524 selectionChangedEventObject);
527 } 525 }
528 } 526 }
529 527
530 }; 528 OCTAVE_END_NAMESPACE(octave);