Changeset 171 for trunk/src/kernel/qapplication_pm.cpp

Timestamp:

Oct 1, 2007, 11:33:02 PM (18 years ago)

Author:

dmik

Message:

Kernel: Fixed: QWidge::pmEvent() was not called for key press/release events delivered to non-toplevel widgets.

File:

• trunk/src/kernel/qapplication_pm.cpp (modified) (3 diffs)

trunk/src/kernel/qapplication_pm.cpp

@@ -1199 +1199 @@
     }
 
-    if ( widget->pmEvent( &qmsg ) )             // send through widget filter
-        RETURN( TRUE );
+    // send through widget filter
+    // (WM_CHAR will be handled later)
+    if ( msg != WM_CHAR )
+        if ( widget->pmEvent( &qmsg ) )
+            RETURN( TRUE );
 
     if ( isMouseEvent ) {                       // mouse events
-        if ( qApp->activePopupWidget() != 0 ) { // in popup mode
-            QWidget* w = QApplication::widgetAt( qmsg.ptl.x, qmsg.ptl.y, TRUE );
-            if ( w ) {
+        if ( qApp->activePopupWidget() != 0 ) { // in popup mode
+            QWidget* w = QApplication::widgetAt( qmsg.ptl.x, qmsg.ptl.y, TRUE );
+            if ( w ) {
                 POINTL ptl = { SHORT1FROMMP(qmsg.mp1), SHORT2FROMMP(qmsg.mp1) };
                 WinMapWindowPoints( qmsg.hwnd, w->winId(), &ptl, 1 );
                 qmsg.mp1 = MPFROM2SHORT( ptl.x, ptl.y );
-                widget = (QETWidget*)w;
+                widget = (QETWidget*)w;
             }
-        }
+        }
         result = widget->translateMouseEvent( qmsg );
         rc = (MRESULT) result;
 #ifndef QT_NO_WHEELEVENT
     } else if ( msg == WM_VSCROLL || msg == WM_HSCROLL ) {
-        result = widget->translateWheelEvent( qmsg );
+        result = widget->translateWheelEvent( qmsg );
         rc = (MRESULT) result;
 #endif
@@ -1224 +1227 @@
 #endif
     } else {
-        switch ( msg ) {
-
+        switch ( msg ) {
+        
         case WM_TRANSLATEACCEL:
             if ( widget->isTopLevel() ) {
@@ -1263 +1266 @@
 //                    || widget->winId() == WinQueryFocus( HWND_DESKTOP ) ) // We faked the message to go to exactly that widget.
                 widget = (QETWidget*)widget->topLevelWidget();
+
+            if ( widget->pmEvent( &qmsg ) )
+                RETURN( TRUE );
+
             if ( widget->isEnabled() ) {
 /// @todo (dmik) we should not pass WM_CHAR to the default window proc,