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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdeui
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-09-19 14:17:44
Message-ID: 20040919141744.44D67126CC () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

backport: don't crash on right click (#89760)


  M +6 -4      klineedit.cpp   1.181.2.1
  M +7 -0      klineedit.h   1.117.2.1


--- kdelibs/kdeui/klineedit.h  #1.117:1.117.2.1
@@ -501,4 +501,11 @@ protected:
     * Re-implemented for internal reasons.  API not affected.
     *
+    * See QLineEdit::contextMenuEvent().
+    */
+    virtual void contextMenuEvent( QContextMenuEvent * );
+
+    /**
+    * Re-implemented for internal reasons.  API not affected.
+    *
     * See QLineEdit::createPopupMenu().
     */

--- kdelibs/kdeui/klineedit.cpp  #1.181:1.181.2.1
@@ -837,12 +837,14 @@ void KLineEdit::tripleClickTimeout()
 }
 
+void KLineEdit::contextMenuEvent( QContextMenuEvent * e )
+{
+    if ( m_bEnableMenu )
+        QLineEdit::contextMenuEvent( e );
+}
+
 QPopupMenu *KLineEdit::createPopupMenu()
 {
     enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll };
 
-    // Return if popup menu is not enabled !!
-    if ( !m_bEnableMenu )
-        return 0;
-
     QPopupMenu *popup = QLineEdit::createPopupMenu();
 


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