Changeset 114

Timestamp:

Aug 10, 2006, 7:56:11 PM (19 years ago)

Author:

dmik

Message:

Kernel: Updated QPMMime to use QPMObjectWindow instead of its own QPMMime::Messenger.

Location:

trunk

Files:

• include/qmime.h (modified) (6 diffs)
• src/kernel/qdnd_pm.cpp (modified) (3 diffs)
• src/kernel/qmime_pm.cpp (modified) (3 diffs)

trunk/include/qmime.h

@@ -174 +174 @@
 
 #if !defined(QT_NO_DRAGANDDROP)
-
-    class Messenger
-    {
-    public:
-        Messenger();
-        virtual ~Messenger();
-        HWND hwnd() const { return w; }
-        virtual MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 ) = 0;
-    private:
-        HWND w;
-        static MRESULT EXPENTRY windowProc( HWND, ULONG, MPARAM, MPARAM );
-    };
 
     class DragWorker
@@ -216 +204 @@
     };
     
-    class DefaultDragWorker : public DragWorker, public Messenger
+    class DefaultDragWorker : public DragWorker, public QPMObjectWindow
     {
     private:
@@ -227 +215 @@
         bool isExclusive() const;
         ULONG itemCount() const;
-        HWND hwnd() const { return Messenger::hwnd(); }
+        HWND hwnd() const { return QPMObjectWindow::hwnd(); }
         QCString composeFormatString();
         bool prepare( const char *drm, const char *drf, DRAGITEM *item,
@@ -233 +221 @@
         void defaultFileType( const char *&type, const char *&ext );
         
-        // Messenger interface
+        // QPMObjectWindow interface
         MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 );
 
@@ -278 +266 @@
     };
 
-    class DefaultDropWorker : public DropWorker, public Messenger
+    class DefaultDropWorker : public DropWorker, public QPMObjectWindow
     {
     private:
@@ -293 +281 @@
         QByteArray encodedData( const char *format ) const;
         
-        // Messenger interface
+        // QPMObjectWindow interface
         MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 );
     

trunk/src/kernel/qdnd_pm.cpp

@@ -588 +588 @@
 }
 
-class QPMCoopDragWorker : public QPMMime::DragWorker, QPMMime::Messenger
+class QPMCoopDragWorker : public QPMMime::DragWorker, public QPMObjectWindow
 {
 public:
@@ -602 +602 @@
     DRAGINFO *createDragInfo( const char *name, USHORT supportedOps );
 
-    // Messenger interface
+    // QPMObjectWindow interface
     MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 );
     
@@ -746 +746 @@
     }
     
-    return QPMMime::Messenger::hwnd();
+    return QPMObjectWindow::hwnd();
 }
 

trunk/src/kernel/qmime_pm.cpp

@@ -211 +211 @@
 {
     return hex_to_int( (uchar) c );
-}
-
-// -----------------------------------------------------------------------------
-
-static QPtrList<HWND> msgWindows;
-
-static void destroyAllMessengerWindows()
-{
-    for ( HWND *w = msgWindows.first(); w; w = msgWindows.next() ) {
-        Q_ASSERT( *w );
-        WinDestroyWindow( *w );
-        // tell Messenger the window has been destroyed
-        *w = 0; 
-    }
-}
-
-QPMMime::Messenger::Messenger() : w( 0 )
-{
-    static const char *ClassName = "QPMMime::Messenger";
-    static bool classRegistered = FALSE;
-    if ( !classRegistered ) {
-        WinRegisterClass( 0, ClassName, windowProc, 0, QWL_USER + sizeof(PVOID) );
-        classRegistered = TRUE;
-        // make sure windows are destroyed before the message queue
-        qAddPostRoutine ( destroyAllMessengerWindows );
-    }
-
-    w = WinCreateWindow( HWND_OBJECT, ClassName,
-                         NULL, 0, 0, 0, 0, 0, NULL,
-                         HWND_BOTTOM, 0, this, NULL );
-    Q_ASSERT( w );
-    if ( w )
-        msgWindows.append( &w );
-}
-
-QPMMime::Messenger::~Messenger()
-{
-    if ( w ) {
-        msgWindows.removeRef( &w );
-        HWND h = w;
-        w = 0; // tell windowProc() we're unsafe
-        WinDestroyWindow( h );
-    }
-}
-
-//static
-MRESULT EXPENTRY QPMMime::Messenger::windowProc( HWND hwnd, ULONG msg,
-                                                 MPARAM mp1, MPARAM mp2 )
-{
-    if ( msg == WM_CREATE ) {
-        Messenger *that = (Messenger *) mp1;
-        if ( !that )
-            return (MRESULT) TRUE;
-        WinSetWindowPtr( hwnd, QWL_USER, that );
-        return (MRESULT) FALSE;
-    }
-
-    Messenger *that = (Messenger *) WinQueryWindowPtr( hwnd, QWL_USER );
-    Q_ASSERT( that );
-    
-    // Note: before WinCreateWindow() returns to the constructor or after the
-    // destructor has been called, w is 0. We use this to determine that the
-    // object is in the unsafe state (VTBL is not yet initialized or has been
-    // already uninitialized), so message() points to never-never land.
-    if ( !that || !that->w )
-        return (MRESULT) FALSE;
-    
-    return that->message( msg, mp1, mp2 );
 }
 
@@ -1754 +1686 @@
     DropWorker *dropWorkerFor( DRAGINFO *info );
 
-    class NativeFileDrag : public DragWorker, public Messenger
+    class NativeFileDrag : public DragWorker, public QPMObjectWindow
     {
     public:
@@ -1761 +1693 @@
         bool isExclusive() const { return TRUE; }
         ULONG itemCount() const { return 0; } // super exclusive
-        HWND hwnd() const { return Messenger::hwnd(); }
+        HWND hwnd() const { return QPMObjectWindow::hwnd(); }
         DRAGINFO *createDragInfo( const char *name, USHORT supportedOps );
-        // Messenger interface (dummy implementation, we don't need to interact)
+        // QPMObjectWindow interface (dummy implementation, we don't need to interact)
         MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 ) { return 0; }
     };