Changeset 134 for trunk/src/user32/user32.cpp

Timestamp:

Jun 20, 1999, 6:47:39 PM (26 years ago)

Author:

sandervl

Message:

Parent notification changes

File:

• trunk/src/user32/user32.cpp (modified) (4 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.8 1999-06-20 14:02:13 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.9 1999-06-20 16:47:39 sandervl Exp $ */
 
 /*
@@ -625 +625 @@
     }
     if(window) {
-        window->SetWindowHandle(hwnd);
-    }
-    //SvL: Taken from Wine
-    if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
-    {
-        /* Notify the parent window only */
-        SendMessageA(parent, WM_PARENTNOTIFY, MAKEWPARAM(WM_CREATE, 0), (LPARAM)hwnd );
+        window->SetWindowHandle(hwnd);
     }
 
@@ -955 +949 @@
  LONG rc;
 
-#ifdef DEBUG
-    WriteLog("USER32:  GetWindowLong %X %d\n", hwnd, nIndex);
-#endif
     if(nIndex == GWL_WNDPROC || nIndex == DWL_DLGPROC) {
-     Win32WindowProc *window = Win32WindowProc::FindProc(hwnd);
-     if(window && !(nIndex == DWL_DLGPROC && window->IsWindow() == TRUE)) {
-        return (LONG)window->GetWin32Callback();
-     }
+#ifdef DEBUG
+        WriteLog("USER32:  GetWindowLong %X %d\n", hwnd, nIndex);
+#endif
+        Win32WindowProc *window = Win32WindowProc::FindProc(hwnd);
+        if(window && !(nIndex == DWL_DLGPROC && window->IsWindow() == TRUE)) {
+                return (LONG)window->GetWin32Callback();
+        }
     }
     rc = O32_GetWindowLong(hwnd, nIndex);
-#ifdef DEBUG
-    WriteLog("USER32:  GetWindowLong returned %X\n", rc);
-#endif
     return(rc);
 }
@@ -2639 +2630 @@
 BOOL WIN32API PtInRect( const RECT * arg1, POINT  arg2)
 {
-#ifdef DEBUG
+#ifdef DEBUG1
     WriteLog("USER32:  PtInRect\n");
 #endif