Changeset 808 for trunk/src/user32/new/win32wmdichild.cpp

Timestamp:

Sep 3, 1999, 5:09:46 PM (26 years ago)

Author:

sandervl

Message:

MDI child/client changes

File:

• trunk/src/user32/new/win32wmdichild.cpp (modified) (8 diffs)

trunk/src/user32/new/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.2 1999-08-31 17:14:51 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.3 1999-09-03 15:09:46 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -62 +62 @@
     {
     case WM_SETTEXT:
-            DefWindowProcA(Msg, wParam, lParam);
-            menuModifyItem();
-#if 0   
+        DefWindowProcA(Msg, wParam, lParam);
+        menuModifyItem();
         if( client->getMaximizedChild() == this )
-                    MDI_UpdateFrameText( clientWnd->parent, ci->self, MDI_REPAINTFRAME, NULL );
-#endif  
-            return 0;
+                client->updateFrameText(MDI_REPAINTFRAME, NULL);
+        return 0;
 
     case WM_GETMINMAXINFO:
@@ -77 +75 @@
 
     case WM_MENUCHAR:
-            /* MDI children don't have menu bars */
-            client->PostMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)LOWORD(wParam) );
+        /* MDI children don't have menu bars */
+        client->PostMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)LOWORD(wParam) );
         return 0x00010000L;
 
     case WM_CLOSE:
-            client->SendMessageA(WM_MDIDESTROY,(WPARAM16)getWindowHandle(), 0L);
-            return 0;
+        client->SendMessageA(WM_MDIDESTROY,(WPARAM16)getWindowHandle(), 0L);
+        return 0;
 
     case WM_SETFOCUS:
-            if(client->getActiveChild() != this )
-                client->childActivate(this);
+        if(client->getActiveChild() != this )
+            client->childActivate(this);
         break;
 
     case WM_CHILDACTIVATE:
-            client->childActivate(this);
+        client->childActivate(this);
         return 0;
 
@@ -98 +96 @@
 
     case WM_SYSCOMMAND:
-            switch( wParam )
-            {
-                case SC_MOVE:
+        switch( wParam )
+        {
+        case SC_MOVE:
             if( client->getMaximizedChild() == this)
             {
@@ -106 +104 @@
             }
             break;
-            case SC_RESTORE:
-            case SC_MINIMIZE:
-                setStyle(getStyle() | WS_SYSMENU);
+        case SC_RESTORE:
+        case SC_MINIMIZE:
+            setStyle(getStyle() | WS_SYSMENU);
             break;
 
-                case SC_MAXIMIZE:
+        case SC_MAXIMIZE:
             if( client->getMaximizedChild() == this)
             {
-                          return client->SendMessageA(Msg, wParam, lParam);
+                  return client->SendMessageA(Msg, wParam, lParam);
             }
-                setStyle(getStyle() & ~WS_SYSMENU);
+            setStyle(getStyle() & ~WS_SYSMENU);
             break;
 
-                case SC_NEXTWINDOW:
-                     client->SendMessageA(WM_MDINEXT, 0, 0);
-                     return 0;
-
-                case SC_PREVWINDOW: //WM_MDINEXT??
-                     client->SendMessageA(WM_MDINEXT, 0, 0);
-                     return 0;
-            }
+        case SC_NEXTWINDOW:
+             client->SendMessageA(WM_MDINEXT, 0, 0);
+             return 0;
+
+        case SC_PREVWINDOW: //WM_MDINEXT??
+             client->SendMessageA(WM_MDINEXT, 0, 0);
+             return 0;
+        }
         break;
 
     case WM_SETVISIBLE:
+        if( client->getMaximizedChild()) {
+                client->setMdiFlags(client->getMdiFlags() & ~MDIF_NEEDUPDATE);
+        }
+        else    client->postUpdate(SB_BOTH+1);
+        break;
+
+    case WM_SIZE:
+        /* do not change */
+        if( client->getActiveChild() == this && wParam != SIZE_MAXIMIZED )
+        {
+            client->setActiveChild(NULL);
 #if 0
-        if( client->getMaximizedChild()) ci->mdiFlags &= ~MDIF_NEEDUPDATE;
-            else
-            MDI_PostUpdate(clientWnd->hwndSelf, ci, SB_BOTH+1);
+            MDI_RestoreFrameMenu( clientWnd->parent, hwnd);
 #endif
-        break;
-
-#if 0           
-    case WM_SIZE:
-            /* do not change */
-
-            if( ci->hwndActiveChild == hwnd && wParam != SIZE_MAXIMIZED )
-            {
-                ci->hwndChildMaximized = 0;
-        
-                MDI_RestoreFrameMenu( clientWnd->parent, hwnd);
-            MDI_UpdateFrameText( clientWnd->parent, ci->self,
-                                 MDI_REPAINTFRAME, NULL );
-            }
-
-            if( wParam == SIZE_MAXIMIZED )
-            {
-                HWND16 hMaxChild = ci->hwndChildMaximized;
-
-                if( hMaxChild == hwnd ) break;
-
-                if( hMaxChild)
-                {       
-                    SendMessage16( hMaxChild, WM_SETREDRAW, FALSE, 0L );
-
-                    MDI_RestoreFrameMenu( clientWnd->parent, hMaxChild);
-                    ShowWindow16( hMaxChild, SW_SHOWNOACTIVATE);
-
-                    SendMessage16( hMaxChild, WM_SETREDRAW, TRUE, 0L );
-                }
-
-                ci->hwndChildMaximized = hwnd; /* !!! */
-                ci->hwndActiveChild = hwnd;
-
-                MDI_AugmentFrameMenu( ci, clientWnd->parent, hwnd);
-                MDI_UpdateFrameText( clientWnd->parent, ci->self,
-                                 MDI_REPAINTFRAME, NULL );
-            }
-
-            if( wParam == SIZE_MINIMIZED )
-            {
-                HWND16 switchTo = MDI_GetWindow(clientWnd, hwnd, TRUE, WS_MINIMIZE);
-
-                if( switchTo )
-                    SendMessage16( switchTo, WM_CHILDACTIVATE, 0, 0L);
-            }
-        
-            MDI_PostUpdate(clientWnd->hwndSelf, ci, SB_BOTH+1);
-            break;
+            client->updateFrameText(MDI_REPAINTFRAME, NULL );
+        }
+
+        if( wParam == SIZE_MAXIMIZED )
+        {
+            Win32MDIChildWindow *maxChild = client->getMaximizedChild();
+
+            if( maxChild == this ) break;
+
+            if( maxChild)
+            {
+                maxChild->SendMessageA(WM_SETREDRAW, FALSE, 0L );
+#if 0
+                MDI_RestoreFrameMenu( clientWnd->parent, hMaxChild);
 #endif
+                maxChild->ShowWindow(SW_SHOWNOACTIVATE);
+
+                maxChild->SendMessageA(WM_SETREDRAW, TRUE, 0L );
+            }
+
+            client->setMaximizedChild(this);
+            client->setActiveChild(this);
+
+#if 0
+            MDI_AugmentFrameMenu( ci, clientWnd->parent, hwnd);
+#endif
+            client->updateFrameText(MDI_REPAINTFRAME, NULL );
+        }
+
+        if( wParam == SIZE_MINIMIZED )
+        {
+            Win32MDIChildWindow *switchTo = client->getWindow(this, TRUE, WS_MINIMIZE);
+
+            if( switchTo )
+                switchTo->SendMessageA(WM_CHILDACTIVATE, 0, 0L);
+        }
+
+        client->postUpdate(SB_BOTH+1);
+        break;
 
 #if 0
     case WM_NEXTMENU:
-            if( wParam == VK_LEFT )             /* switch to frame system menu */
+        if( wParam == VK_LEFT )     /* switch to frame system menu */
         {
             return MAKELONG( GetSubMenu(clientWnd->parent->hSysMenu, 0),
-                           clientWnd->parent->hwndSelf );
+               clientWnd->parent->hwndSelf );
             goto END;
         }
-            if( wParam == VK_RIGHT )    /* to frame menu bar */
+        if( wParam == VK_RIGHT )    /* to frame menu bar */
         {
             retvalue = MAKELONG( clientWnd->parent->wIDmenu,
-                           clientWnd->parent->hwndSelf );
+               clientWnd->parent->hwndSelf );
             goto END;
         }
 #endif
     case WM_SYSCHAR:
-            if (wParam == '-')
-            {
-                    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
-                    return 0;
-            }
+        if (wParam == '-')
+        {
+            SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
+            return 0;
+        }
     }
     return DefWindowProcA(Msg, wParam, lParam);
@@ -214 +210 @@
 LRESULT Win32MDIChildWindow::DefMDIChildProcW(UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+ Win32MDIClientWindow *client = (Win32MDIClientWindow *)getParent();
+
     switch (Msg)
     {
     case WM_SETTEXT:
-            DefWindowProcW(Msg, wParam, lParam);
-            menuModifyItem();
-#if 0   
-            if( client->getMaximizedChild() == this )
-                    MDI_UpdateFrameText( clientWnd->parent, ci->self, MDI_REPAINTFRAME, NULL );
-#endif  
-            return 0;
-        
+        DefWindowProcW(Msg, wParam, lParam);
+        menuModifyItem();
+        if( client->getMaximizedChild() == this )
+                client->updateFrameText(MDI_REPAINTFRAME, NULL );
+
+        return 0;
+
     case WM_GETMINMAXINFO:
     case WM_MENUCHAR:
@@ -236 +233 @@
     case WM_NEXTMENU:
         return DefMDIChildProcA(Msg, wParam, lParam );
-        
+
     case WM_SYSCHAR:
         if (wParam == '-')
-            {
-                    SendMessageW(WM_SYSCOMMAND, SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
-                    return 0;
-            }
-            break;
+        {
+            SendMessageW(WM_SYSCOMMAND, SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
+            return 0;
+        }
+        break;
     }
     return DefWindowProcW(Msg, wParam, lParam);
@@ -338 +335 @@
 #if 0
                     MDI_AugmentFrameMenu( ci, w->parent, hwnd );
-                    MDI_UpdateFrameText( w->parent, ci->self, MDI_REPAINTFRAME, NULL );
+                    client->updateFrameText(MDI_REPAINTFRAME, NULL );
 #endif
                 }