Changeset 8 for trunk/src/kernel/qwidget.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/kernel/qwidget.cpp (modified) (12 diffs)

trunk/src/kernel/qwidget.cpp

@@ -61 +61 @@
 #include "qinputcontext_p.h"
 #endif
+#if defined(Q_WS_PM)
+#include "qt_os2.h"
+#endif
 #if defined(Q_WS_QWS)
 #include "qwsmanager_qws.h"
@@ -513 +516 @@
   QWidget utility functions
  *****************************************************************************/
-
 static QFont qt_naturalWidgetFont( QWidget* w ) {
     QFont naturalfont = QApplication::font( w );
@@ -3259 +3261 @@
 #if defined(Q_WS_WIN)
         && GetFocus() == winId()
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): currently we don't use WinSetFocus(). what for? Qt seems
+//  to completely handle focus traversal itself. 
+//      && WinQueryFocus( HWND_DESKTOP ) == winId()
 #endif
         )
@@ -3294 +3300 @@
             SetFocus( winId() );
         else {
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): currently we don't use WinSetFocus(). what for? Qt seems
+//  to completely handle focus traversal itself. 
+//      if ( !topLevelWidget()->isPopup() )
+//          WinSetFocus( HWND_DESKTOP, winId() );
+//      else {
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
             QAccessible::updateAccessibility( this, 0, QAccessible::Focus );
 #endif
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) // || defined(Q_WS_PM)
         }
 #endif
@@ -3345 +3357 @@
             SetFocus( 0 );
         else {
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): currently we don't use WinSetFocus(). what for? Qt seems
+//  to completely handle focus traversal itself. 
+//      if ( !isPopup() && WinQueryFocus( HWND_DESKTOP ) == winId() )
+//          WinSetFocus( HWND_DESKTOP, topLevelWidget()->winId() );
+//      else {
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
             QAccessible::updateAccessibility( this, 0, QAccessible::Focus );
 #endif
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) // || defined(Q_WS_PM)
         }
 #endif
@@ -3567 +3585 @@
     }
 #endif
+//@@TODO (dmik): I think we don't need the same as above in OS/2,
+//  because if the window is active (in Qt terminology)
+//  qApp->activeWindow() will be equal to toplevelWidget() which is
+//  checked at the beginnig.
 
     return FALSE;
@@ -3985 +4007 @@
     // On Windows, show the popup now so that our own focus handling
     // stores the correct old focus widget even if it's stolen in the showevent
+//@@TODO (dmik): need the same in OS/2? guess not.        
 #if defined(Q_WS_WIN)
     if ( testWFlags(WType_Popup) )
@@ -4006 +4029 @@
         showWindow();
 
-#if !defined(Q_WS_WIN)
+//@@TODO (dmik): need the same in OS/2? guess not.        
+#if !defined(Q_WS_WIN) 
     if ( testWFlags(WType_Popup) )
         qApp->openPopup( this );
@@ -4048 +4072 @@
         qt_leave_modal( this );
 
-#if defined(Q_WS_WIN)
+//@@TODO (dmik): is it correct for OS/2?    
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() )
         parentWidget()->setActiveWindow();      // Activate parent
@@ -4927 +4952 @@
         }
 
+#ifndef Q_WS_PM
+    // We disable this on OS/2 since we send these events from qt_sendBlocked()
+    // which does it more accurately compared to the code below -- only those
+    // widgets that have actually been blocked/unblocked (not less and not
+    // more) will receive these events.         
     case QEvent::WindowBlocked:
     case QEvent::WindowUnblocked:
@@ -4938 +4968 @@
         }
         break;
+#endif        
 
     default:
@@ -5527 +5558 @@
 */
 bool QWidget::winEvent( MSG * )
+{
+    return FALSE;
+}
+
+#endif
+#if defined(Q_WS_PM)
+
+/*!
+    This special event handler can be reimplemented in a subclass to
+    receive native OS/2 PM events.
+
+    In your reimplementation of this function, if you want to stop the
+    event being handled by Qt, return TRUE. If you return FALSE, this
+    native event is passed back to Qt, which translates the event into
+    a Qt event and sends it to the widget.
+
+    \warning This function is not portable.
+
+    \sa QApplication::pmEventFilter()
+*/
+bool QWidget::pmEvent( QMSG * )
 {
     return FALSE;