[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdeui
From:       Leon Bottou <leon () bottou ! org>
Date:       2003-10-31 16:17:18
[Download RAW message or body]

CVS commit by leonb: 

Focus navigation was still broken when using two levels of embedding.
Function QPublicWidget::focusNextPrevChild() was here to give access
to the otherwise protected focusNextPrevChild(). This is a virtual 
function.  We do not want to call it as QWidget::focusNextPrevChild()
because that defeats virtual functions.  The only solution is to give
another name to QPublicWidget::focusNextPrevChild()...


  M +5 -5      qxembed.cpp   1.58


--- kdelibs/kdeui/qxembed.cpp  #1.57:1.58
@@ -179,5 +179,5 @@ public:
     QTLWExtra* topData() { return QWidget::topData(); }
     QFocusData *focusData(){ return QWidget::focusData(); }
-    bool focusNextPrevChild(bool b) { return QWidget::focusNextPrevChild(b); }
+    bool focusNextPrev(bool b) { return focusNextPrevChild(b); }
 };
 
@@ -362,9 +362,9 @@ bool QXEmbedAppFilter::eventFilter( QObj
                 if ( k->key() == Key_Backtab || (k->key() == Key_Tab && (k->state() & ShiftButton)) ) {
                     QFocusEvent::setReason( QFocusEvent::Backtab );
-                    res = ((QPublicWidget*)w)->focusNextPrevChild( tabForward = false );
+                    res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false );
                     QFocusEvent::resetReason();
                 } else if ( k->key() == Key_Tab ) {
                     QFocusEvent::setReason( QFocusEvent::Tab );
-                    res = ((QPublicWidget*)w)->focusNextPrevChild( tabForward = true );
+                    res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true );
                     QFocusEvent::resetReason();
                 }
@@ -487,5 +487,5 @@ static int qxembed_x11_event_filter( XEv
                             QFocusEvent::setReason( QFocusEvent::Tab );
                             w->topLevelWidget()->setFocus();
-                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrevChild(true);
+                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
                             QFocusEvent::resetReason();
                         }
@@ -496,5 +496,5 @@ static int qxembed_x11_event_filter( XEv
                             QFocusEvent::setReason( QFocusEvent::Tab );
                             w->topLevelWidget()->setFocus();
-                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrevChild(false);
+                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
                             QFocusEvent::resetReason();
                         }


[prev in list] [next in list] [prev in thread] [next in thread]