Changeset 77 for trunk/src/kernel/qeventloop_pm.cpp

Timestamp:

Apr 2, 2006, 12:41:47 AM (19 years ago)

Author:

dmik

Message:

Implemented the OS/2 version of the QSessionManager class (see ticket:15 for more details); QT_NO_SESSIONMANAGER is no more defined by default.

File:

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

trunk/src/kernel/qeventloop_pm.cpp

@@ -51 +51 @@
 extern bool qt_pmEventFilter( QMSG* msg, MRESULT &result );
 
+#if !defined (QT_NO_SESSIONMANAGER)
+extern bool qt_app_canQuit(); // defined in qapplication_pm.cpp
+#endif
+
 static HAB qt_gui_hab = 0;
 static HMQ qt_gui_queue = 0;
-//@@TODO (dmik): later
-//// Simpler timers are needed when Qt does not have the event loop,
-//// such as for plugins.
+
+/// @todo (dmik) later
+//  Simpler timers are needed when Qt does not have the event loop,
+//  such as for plugins.
 //#ifndef Q_OS_TEMP
 //Q_EXPORT bool qt_win_use_simple_timers = TRUE;
@@ -433 +438 @@
 // recursive mutex to serialize access to socket notifier data
 static QMutex ss_mutex( TRUE );
-// flag to indicate a presence of sockets to do select() (we use QSemaphore
+// flag to indicate the presence of sockets to do select() (we use QSemaphore
 // instead of QWaitCondition because we need the "level-triggered" semantics,
-// the "edge-triggered" one can produce deadlocks)
+// the "edge-triggered" semantics can produce deadlocks)
 static QSemaphore ss_flag( 1 );
 
@@ -786 +791 @@
             locker.mutex()->unlock();
 #endif // QT_THREAD_SUPPORT
-            if ( !WinGetMsg( 0, &msg, 0, 0, 0 ) ) {
+            if ( !WinGetMsg( 0, &msg, 0, 0, 0 ) ) {     // WM_QUIT received
+#if !defined (QT_NO_SESSIONMANAGER)
+                if ( qt_app_canQuit() ) {
+#endif                    
 #ifdef QT_THREAD_SUPPORT
-                locker.mutex()->lock();
-#endif // QT_THREAD_SUPPORT
-                exit( 0 );                              // WM_QUIT received
-                return FALSE;
+                    locker.mutex()->lock();
+#endif // QT_THREAD_SUPPORT
+                    exit( 0 );
+                    return FALSE;
+#if !defined (QT_NO_SESSIONMANAGER)
+                } else {
+                    WinCancelShutdown( d->hmq, FALSE );
+                }
+#endif                    
             }
 #ifdef QT_THREAD_SUPPORT