Changeset 89 for trunk/src

Timestamp:

Jul 27, 2009, 10:25:33 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Move QPMObjectWindow declaration to QtCore/private/qpmobjectwindow_pm_p.h (to avoid qwindowdefs_pm.h misuse). Refer to qwindowdefs_pm.h from qwindowdefs.h.

Location:

trunk/src

Files:

• corelib/kernel/qeventdispatcher_pm.cpp (modified) (2 diffs)
• corelib/kernel/qeventdispatcher_pm_p.h (modified) (1 diff)
• corelib/kernel/qpmobjectwindow_pm_p.h (added)
• gui/kernel/qwindowdefs.h (modified) (1 diff)
• gui/kernel/qwindowdefs_pm.h (modified) (1 diff)

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -56 +56 @@
 #include "qabstracteventdispatcher_p.h"
 #include "qcoreapplication_p.h"
+
 
 #include <private/qthread_p.h>
 #include <private/qmutexpool_p.h>
-
-#include <Qt/qwindowdefs_pm.h> // for QPMObjectWindow declaration
 
 #include <sys/socket.h>
@@ -72 +71 @@
 /*****************************************************************************
   Auxiliary object window class for dedicated message processing.
-  Declared in qwindowdefs_pm.h
+  Declared in q.h
  *****************************************************************************/
 
 /*!
-    \class QPMObjectWindow qwindowdefs.h
+    \class QPMObjectWindow
 
     The QPMObjectWindow class is an auxiliary class for dedicated message

trunk/src/corelib/kernel/qeventdispatcher_pm_p.h

@@ -57 +57 @@
 
 #include "QtCore/qabstracteventdispatcher.h"
-#include "QtCore/qt_os2.h"
 
 QT_BEGIN_NAMESPACE

trunk/src/gui/kernel/qwindowdefs.h

@@ -111 +111 @@
 #endif // Q_WS_WIN
 
+
+
+
+
 #if defined(Q_WS_X11)
 

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -55 +55 @@
 QT_END_NAMESPACE
 
+
+
+
+
 typedef HWND WId;
 
 QT_BEGIN_NAMESPACE
-
-class Q_CORE_EXPORT QPMObjectWindow
-{
-public:
-    QPMObjectWindow(bool deferred = false);
-    virtual ~QPMObjectWindow();
-
-    bool create();
-    bool destroy();
-    HWND hwnd() const { return w; }
-
-    MRESULT send(ULONG msg, MPARAM mp1, MPARAM mp2) const {
-        return WinSendMsg(w, msg, mp1, mp2);
-    }
-
-    bool post(ULONG msg, MPARAM mp1, MPARAM mp2) const {
-        return WinPostMsg(w, msg, mp1, mp2);
-    }
-
-    virtual MRESULT message(ULONG msg, MPARAM mp1, MPARAM mp2) = 0;
-
-private:
-    static MRESULT EXPENTRY windowProc(HWND, ULONG, MPARAM, MPARAM);
-
-    HWND w;
-};
 
 QT_END_NAMESPACE