summaryrefslogtreecommitdiff
path: root/library/qpemenubar.cpp
Unidiff
Diffstat (limited to 'library/qpemenubar.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpemenubar.cpp47
1 files changed, 24 insertions, 23 deletions
diff --git a/library/qpemenubar.cpp b/library/qpemenubar.cpp
index bb3ad8d..f0171ba 100644
--- a/library/qpemenubar.cpp
+++ b/library/qpemenubar.cpp
@@ -1,6 +1,6 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2001 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
@@ -248,17 +248,21 @@ bool QPEMenuToolFocusManager::eventFilter( QObject *object, QEvent *event )
248 } else if ( event->type() == QEvent::ChildInserted ) { 248 } else if ( event->type() == QEvent::ChildInserted ) {
249 QChildEvent *ce = (QChildEvent *)event; 249 QChildEvent *ce = (QChildEvent *)event;
250 if ( ce->child()->inherits( "QMenuBar" ) ) { 250 if ( ce->child()->isWidgetType() ) {
251 addWidget( (QWidget *)ce->child() ); 251 if ( ce->child()->inherits( "QMenuBar" ) ) {
252 ce->child()->installEventFilter( this ); 252 addWidget( (QWidget *)ce->child() );
253 } else if ( object->inherits( "QToolBar" ) && ce->child()->isWidgetType() ) { 253 ce->child()->installEventFilter( this );
254 addWidget( (QWidget *)ce->child() ); 254 } else if ( object->inherits( "QToolBar" ) ) {
255 addWidget( (QWidget *)ce->child() );
256 }
255 } 257 }
256 } else if ( event->type() == QEvent::ChildRemoved ) { 258 } else if ( event->type() == QEvent::ChildRemoved ) {
257 QChildEvent *ce = (QChildEvent *)event; 259 QChildEvent *ce = (QChildEvent *)event;
258 if ( ce->child()->inherits( "QMenuBar" ) ) { 260 if ( ce->child()->isWidgetType() ) {
259 removeWidget( (QWidget *)ce->child() ); 261 if ( ce->child()->inherits( "QMenuBar" ) ) {
260 ce->child()->removeEventFilter( this ); 262 removeWidget( (QWidget *)ce->child() );
261 } else if ( object->inherits( "QToolBar" ) && ce->child()->isWidgetType() ) { 263 ce->child()->removeEventFilter( this );
262 removeWidget( (QWidget *)ce->child() ); 264 } else if ( object->inherits( "QToolBar" ) ) {
265 removeWidget( (QWidget *)ce->child() );
266 }
263 } 267 }
264 } 268 }
@@ -280,5 +284,4 @@ void QPEMenuToolFocusManager::deactivate()
280 This class is obsolete. Use QMenuBar instead. 284 This class is obsolete. Use QMenuBar instead.
281 285
282 \sa QMenuBar
283*/ 286*/
284 287
@@ -307,18 +310,16 @@ void QPEMenuBar::keyPressEvent( QKeyEvent *e )
307} 310}
308 311
309 312/*!
310void QPEMenuBar::activateItem( int index ) 313 \internal
311{ 314*/
315void QPEMenuBar::activateItem( int index ) {
312 activateItemAt( index ); 316 activateItemAt( index );
313} 317}
314 318void QPEMenuBar::goodbye() {
315void QPEMenuBar::goodbye()
316{
317 activateItemAt(-1); 319 activateItemAt(-1);
318 for ( unsigned int i = 0; i < count(); i++ ) { 320 for ( uint i = 0; i < count(); i++ ) {
319 QMenuItem *mi = findItem( idAt(i) ); 321 QMenuItem* mi = findItem( idAt(i) );
320 if ( mi->popup() ) { 322 if (mi->popup() )
321 mi->popup()->hide(); 323 mi->popup()->hide();
322 }
323 } 324 }
324} 325}