Changeset 10379 for trunk/src/user32/win32wbase.cpp

Timestamp:

Jan 11, 2004, 1:04:44 PM (22 years ago)

Author:

sandervl

Message:

Update

File:

• trunk/src/user32/win32wbase.cpp (modified) (11 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.382 2003-11-17 13:15:03 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.383 2004-01-11 12:03:18 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -68 +68 @@
 #include "timer.h"
 #include "user32api.h"
+#include "callwrap.h"
 
 #define DBG_LOCALLOG    DBG_win32wbase
@@ -144 +145 @@
         DebugInt3();
   }
+  Win32HwndOrg     = Win32Hwnd;
 
   posx = posy      = 0;
@@ -249 +251 @@
     }
 
-    /* Decrement class window counter */
+    // Decrement class window counter 
+    // NOTE: Must be done before ReleaseDC call for ownDC!
     if(windowClass) {
         RELEASE_CLASSOBJ(windowClass);
     }
 
-    if(isOwnDC())
-        releaseOwnDC(ownDC);
+    if(ownDC)
+        ReleaseDC(Win32HwndOrg, ownDC);
 
     if(Win32Hwnd)
@@ -670 +673 @@
         //DC among different windows... DevOpenDC apparently can't be used
         //for window DCs and WinOpenWindowDC must be associated with a window
-        ownDC = GetDCEx(getWindowHandle(), NULL, DCX_USESTYLE);
+        ownDC = 0; //GetDCEx(getWindowHandle(), NULL, DCX_USESTYLE);
     }
     /* Set the window menu */
@@ -888 +891 @@
             HwFreeWindowHandle(Win32Hwnd);
             Win32Hwnd = 0;
+        }
+        // Decrement class window counter 
+        // NOTE: Must be done before ReleaseDC call for ownDC!
+        if(windowClass) {
+            RELEASE_CLASSOBJ(windowClass);
+        }
+
+        if(ownDC) {
+            ReleaseDC(Win32Hwnd, ownDC);
+            ownDC = 0;
         }
     }
@@ -2351 +2364 @@
 
     case SW_SHOWNOACTIVATE:
-        swp |= SWP_NOZORDER;
-        if (GetActiveWindow())
-            swp |= SWP_NOACTIVATE;
+        swp |= SWP_NOZORDER | SWP_NOACTIVATE;
         /* fall through */
     case SW_SHOWNORMAL:  /* same as SW_NORMAL: */
@@ -2539 +2550 @@
             dprintf(("new window rectangle (%d,%d)(%d,%d)", rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
         }
+    }
+
+    // Hack alert: This makes sure the tooltips windows in OpenOffice don't 
+    //             activate the owner windows too.
+    //             First condition takes care of SetWindowPos during window
+    //             creation. The 2nd one for calls made by OpenOffice
+    if(((getStyle() & WS_POPUP) && (getExStyle() & WS_EX_TOPMOST)) || (fuFlags & SWP_NOOWNERZORDER)) 
+    { 
+        //SWP_NOOWNERZORDER means only the z-order of this window changes; it
+        //should not affect the owner
+        //PM doesn't support this feature, so this hack might work
+        wpos.flags |= SWP_NOZORDER;
     }
 
@@ -3123 +3146 @@
         child->addRef();
         unlock();
-        if(lpfn(hwnd, lParam) == FALSE)
+        if(WrapCallback2((WNDPROC)lpfn, hwnd, lParam) == FALSE)
         {
                 child->release();
@@ -3189 +3212 @@
             if(dwThreadId == tid) {
                 dprintf(("EnumThreadWindows: Found Window %x", hwndWin32));
-                if((rc = lpfn(hwndWin32, lParam)) == FALSE) {
+                if((rc = WrapCallback2((WNDPROC)lpfn, hwndWin32, lParam)) == FALSE) {
                     break;
                 }
@@ -3223 +3246 @@
             {
                 dprintf2(("EnumWindows: Found Window %x", hwnd));
-                if((rc = lpfn(hwnd, lParam)) == FALSE) {
+                if((rc = WrapCallback2((WNDPROC)lpfn, hwnd, lParam)) == FALSE) {
                     break;
                 }