Changeset 5373 for trunk/src

Timestamp:

Mar 25, 2001, 10:50:42 AM (24 years ago)

Author:

sandervl

Message:

hittest workaround for static controls + registerwindowmessage rewrite

Location:

trunk/src/user32

Files:

• static.cpp (modified) (2 diffs)
• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)
• windowmsg.cpp (modified) (3 diffs)

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.21 2000-12-16 15:42:12 sandervl Exp $ */
+/* $Id: static.cpp,v 1.22 2001-03-25 08:50:42 sandervl Exp $ */
 /*
  * Static control
@@ -411 +411 @@
 LRESULT STATIC_NCHitTest(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
-  return HTTRANSPARENT;
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  LRESULT lResult;
+
+  //SvL: If a static window has children, then we can't return HTTRANSPARENT
+  //     here. For some reason PM then sends all mouse messages to the parent
+  //     of the static window; even if they are intended for the children of
+  //     the static window.
+  //     TODO: This could break some win32 apps (parent not receiving mouse
+  //           message for static window (non-child) area)
+  if(GetWindow(hwnd, GW_HWNDFIRST) != 0) {
+       return HTCLIENT;
+  }
+
+  if (dwStyle & SS_NOTIFY)
+       lResult = HTCLIENT;
+  else lResult = HTTRANSPARENT;
+
+  return lResult;
 }
 

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.57 2001-02-18 17:59:05 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.58 2001-03-25 08:50:42 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -288 +288 @@
   INT retval;
 
+    dprintf(("doDialogBox %x", getWindowHandle()));
     /* Owner must be a top-level window */
     if(getOwner() == NULL) {

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.244 2001-02-23 14:52:41 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.245 2001-03-25 08:50:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2555 +2555 @@
 BOOL Win32BaseWindow::SetWindowPlacement(WINDOWPLACEMENT *wndpl)
 {
+   dprintf(("SetWindowPlacement %x min  (%d,%d)", getWindowHandle(), wndpl->ptMinPosition.x, wndpl->ptMinPosition.y));
+   dprintf(("SetWindowPlacement %x max  (%d,%d)", getWindowHandle(), wndpl->ptMaxPosition.x, wndpl->ptMaxPosition.y));
+   dprintf(("SetWindowPlacement %x norm (%d,%d)(%d,%d)", getWindowHandle(), wndpl->rcNormalPosition.left, wndpl->rcNormalPosition.top, wndpl->rcNormalPosition.right, wndpl->rcNormalPosition.bottom));
    windowpos.ptMinPosition    = wndpl->ptMinPosition;
    windowpos.ptMaxPosition    = wndpl->ptMaxPosition;

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.22 2001-02-13 19:59:13 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.23 2001-03-25 08:50:42 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -231 +231 @@
 //******************************************************************************
 //******************************************************************************
-//******************************************************************************
 BOOL WIN32API ReplyMessage(LRESULT result)
 {
@@ -238 +237 @@
 }
 //******************************************************************************
-//SvL: 24-6-'97 - Added
-//******************************************************************************
-UINT WIN32API RegisterWindowMessageA(LPCSTR arg1)
+//******************************************************************************
+UINT WIN32API RegisterWindowMessageA(LPCSTR lpString)
 {
  UINT rc;
 
-    rc = O32_RegisterWindowMessage(arg1);
-    dprintf(("USER32:  RegisterWindowMessageA %s returned %X\n", arg1, rc));
+    rc = GlobalAddAtomA(lpString);
+    dprintf(("USER32:  RegisterWindowMessageA %s returned %X\n", lpString, rc));
     return(rc);
 }
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API RegisterWindowMessageW( LPCWSTR arg1)
-{
- char *astring = UnicodeToAsciiString((LPWSTR)arg1);
- UINT  rc;
-
+UINT WIN32API RegisterWindowMessageW( LPCWSTR lpString)
+{
     dprintf(("USER32:  RegisterWindowMessageW\n"));
-    rc = O32_RegisterWindowMessage(astring);
-    FreeAsciiString(astring);
-    return rc;
+    return GlobalAddAtomW(lpString);
 }
 //******************************************************************************