diff options
Diffstat (limited to 'muse2/muse/widgets/popupmenu.cpp')
| -rw-r--r-- | muse2/muse/widgets/popupmenu.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/muse2/muse/widgets/popupmenu.cpp b/muse2/muse/widgets/popupmenu.cpp index af870975..a34418a4 100644 --- a/muse2/muse/widgets/popupmenu.cpp +++ b/muse2/muse/widgets/popupmenu.cpp @@ -33,7 +33,7 @@ #include <QApplication> //#include <QTimer> -#include <stdio.h> +//#include <stdio.h> //#include <QStandardItemModel> #include "popupmenu.h" @@ -70,13 +70,10 @@ PopupMenu::PopupMenu(const QString& title, QWidget* parent, bool stayOpen) init(); } -PopupMenu::~PopupMenu() -{ - //printf("PopupMenu::~PopupMenu\n"); -} - void PopupMenu::init() { + //printf("PopupMenu::init this:%p\n", this); + // Menus will trigger! Set to make sure our trigger handlers ignore menus. menuAction()->setData(-1); @@ -92,8 +89,14 @@ void PopupMenu::init() #endif // POPUP_MENU_DISABLE_AUTO_SCROLL } +// NOTE: Tested all RoutePopupMenu and PopupMenu dtors and a couple of action dtors from our +// PixmapButtonsHeaderWidgetAction and PixmapButtonsWidgetAction: +// This does not appear to be required any more. All submenus and actions are being deleted now. p4.0.43 +/* void PopupMenu::clear() { + //printf("PopupMenu::clear this:%p\n", this); + QList<QAction*> list = actions(); for(int i = 0; i < list.size(); ++i) { @@ -103,6 +106,7 @@ void PopupMenu::clear() { menu->clear(); // Recursive. act->setMenu(0); // CHECK: Is this OK? + //printf(" deleting menu:%p\n", menu); delete menu; } } @@ -115,6 +119,7 @@ void PopupMenu::clear() connect(timer, SIGNAL(timeout()), SLOT(timerHandler())); #endif // POPUP_MENU_DISABLE_AUTO_SCROLL } +*/ void PopupMenu::clearAllChecks() const { |