[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: qt-copy/src/widgets
From: Dirk Mueller <mueller () kde ! org>
Date: 2003-11-09 20:15:59
[Download RAW message or body]
CVS commit by mueller:
sync with todays rsync
M +8 -4 qpopupmenu.cpp 1.57
--- qt-copy/src/widgets/qpopupmenu.cpp #1.56:1.57
@@ -1,4 +1,4 @@
/****************************************************************************
-**
+** $Id$
**
** Implementation of QPopupMenu class
@@ -303,7 +303,5 @@ QPopupMenu::QPopupMenu( QWidget *parent,
QPopupMenu::~QPopupMenu()
{
- hidePopups();
-
- if ( syncMenu == this ) {
+ if ( syncMenu == this && qApp ) {
qApp->exit_loop();
syncMenu = 0;
@@ -311,4 +310,9 @@ QPopupMenu::~QPopupMenu()
if(d->scroll.scrolltimer)
delete d->scroll.scrolltimer;
+
+ if ( isVisible() ) {
+ parentMenu = 0;
+ hidePopups();
+ }
delete (QWidget*) QMenuData::d->aWidget; // tear-off menu
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic