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

List:       kde-commits
Subject:    kdebase/kicker/core
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-05-24 8:50:14
Message-ID: 20040524085014.BA6D1175E () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Remove old stuff.


  M +1 -33     container_panel.cpp   1.90


--- kdebase/kicker/core/container_panel.cpp  #1.89:1.90
@@ -41,4 +41,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include <karrowbutton.h>
 #include <netwm.h>
+#include <fixx11h.h>
 
 #include "kicker.h"
@@ -52,14 +53,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include "container_panel.moc"
 
-#include <X11/Xlib.h>
-const int XFocusOut = FocusOut;
-const int XFocusIn = FocusIn;
 const int XineramaAllScreens = -2;
-#undef FocusOut
-#undef FocusIn
-#undef KeyPress
-#undef KeyRelease
-
-extern Time qt_x_time;
 
 KWinModule* PanelContainer::kWinModule = 0;
@@ -656,28 +648,4 @@ bool PanelContainer::eventFilter( QObjec
 
     switch ( e->type() ) {
-#if QT_VERSION < 0x030200
-    // The next case is necessary for tooltips to be displayed.
-    // Ratio: Qt only shows tooltips for active windows, meaning
-    // windows that have the keyboard focus. This is usually desireable,
-    // but breaks for always-active desktop utilities like kicker. In order
-    // to see tooltips _always_ we fake a XFocusIn event for Qt whenever we
-    // get the mouse pointer and QApplication does not have an active window.
-    case QEvent::Enter:
-        if  ( !qApp->activeWindow() ) {
-            XEvent ev;
-            memset(&ev, 0, sizeof(ev));
-            ev.xfocus.display = qt_xdisplay();
-            ev.xfocus.type = XFocusIn;
-            ev.xfocus.window = topLevelWidget()->winId();
-            ev.xfocus.mode = NotifyNormal;
-            ev.xfocus.detail = NotifyAncestor;
-            Time time = qt_x_time;
-            qt_x_time = 1;
-            qApp->x11ProcessEvent( &ev );
-            qt_x_time = time;
-            setFocus(); // to avoid having a blinking cursor or a focus rectangle somewhere else
-        }
-        break;
-#endif
     case QEvent::MouseButtonPress:
         {


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