Changeset 2084 for trunk/src/user32/win32wmdiclient.cpp

Timestamp:

Dec 16, 1999, 1:11:49 AM (26 years ago)

Author:

sandervl

Message:

sendmessage + hook updates + misc fixes

File:

• trunk/src/user32/win32wmdiclient.cpp (modified) (12 diffs)

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.13 1999-12-09 10:59:05 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.14 1999-12-16 00:11:48 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -26 +26 @@
 #include <spy.h>
 #include "wndmsg.h"
-#include "hooks.h"
 #include <oslibwin.h>
 #include <oslibutil.h>
@@ -223 +222 @@
     case WM_NCACTIVATE:
         if( activeChild )
-            activeChild->SendMessageA(message, wParam, lParam);
+            activeChild->SendInternalMessageA(message, wParam, lParam);
         break;
 
@@ -344 +343 @@
     {
         prevActive->setStyle(prevActive->getStyle() | WS_SYSMENU);
-        prevActive->SendMessageA( WM_NCACTIVATE, FALSE, 0L );
-        prevActive->SendMessageA( WM_MDIACTIVATE, (WPARAM)prevActive->getWindowHandle(), (LPARAM)(child) ? child->getWindowHandle() : 0);
+        prevActive->SendInternalMessageA( WM_NCACTIVATE, FALSE, 0L );
+        prevActive->SendInternalMessageA( WM_MDIACTIVATE, (WPARAM)prevActive->getWindowHandle(), (LPARAM)(child) ? child->getWindowHandle() : 0);
 
         /* uncheck menu item */
@@ -386 +385 @@
     if( isActiveFrameWnd )
     {
-        child->SendMessageA( WM_NCACTIVATE, TRUE, 0L);
+        child->SendInternalMessageA( WM_NCACTIVATE, TRUE, 0L);
         if( GetFocus() == getWindowHandle())
-            SendMessageA( WM_SETFOCUS, (WPARAM)getWindowHandle(), 0L );
+            SendInternalMessageA( WM_SETFOCUS, (WPARAM)getWindowHandle(), 0L );
         else
             SetFocus( getWindowHandle() );
@@ -394 +393 @@
 
     /* @@@PH prevActive may be NULL actually ?! */
-    child->SendMessageA( WM_MDIACTIVATE,
+    child->SendInternalMessageA( WM_MDIACTIVATE,
                          prevActive ? (WPARAM)prevActive->getWindowHandle() : 0,
                          child->getWindowHandle());
@@ -602 +601 @@
 }
 /**********************************************************************
- *                                      MDI_RestoreFrameMenu
+ *                  MDI_RestoreFrameMenu
  */
 BOOL Win32MDIClientWindow::restoreFrameMenu(Win32BaseWindow *child)
@@ -611 +610 @@
 
     if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
-            return 0;
+        return 0;
 
     /*
@@ -621 +620 @@
 
     GetMenuItemInfoA(getParent()->GetMenu(),
-                             0,
-                             TRUE,
-                             &menuInfo);
+                     0,
+                     TRUE,
+                     &menuInfo);
 
     RemoveMenu(getParent()->GetMenu(),0,MF_BYPOSITION);
@@ -630 +629 @@
 #if 0
     if ((menuInfo.fType & MFT_BITMAP)           &&
-            (LOWORD(menuInfo.dwTypeData)!=0)        &&
-            (LOWORD(menuInfo.dwTypeData)!=hBmpClose) )
+        (LOWORD(menuInfo.dwTypeData)!=0)        &&
+        (LOWORD(menuInfo.dwTypeData)!=hBmpClose) )
     {
         DeleteObject((HBITMAP)LOWORD(menuInfo.dwTypeData));
@@ -660 +659 @@
 
     if (getMaximizedChild())
-        SendMessageA(WM_MDIRESTORE, (WPARAM)getMaximizedChild()->getWindowHandle(), 0);
+        SendInternalMessageA(WM_MDIRESTORE, (WPARAM)getMaximizedChild()->getWindowHandle(), 0);
 
     if (nActiveChildren == 0) return 0;
@@ -706 +705 @@
 
     if (getMaximizedChild())
-        SendMessageA(WM_MDIRESTORE, (WPARAM)getMaximizedChild()->getWindowHandle(), 0);
+        SendInternalMessageA(WM_MDIRESTORE, (WPARAM)getMaximizedChild()->getWindowHandle(), 0);
 
     if (nActiveChildren == 0) return;