Changeset 5935 for trunk/src/user32/win32wmdichild.cpp

Timestamp:

Jun 9, 2001, 4:50:26 PM (24 years ago)

Author:

sandervl

Message:

reference count (window + class objects) rewrite

File:

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

trunk/src/user32/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.25 2000-11-09 18:15:22 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.26 2001-06-09 14:50:23 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -46 +46 @@
 //******************************************************************************
 Win32MDIChildWindow::Win32MDIChildWindow(CREATESTRUCTA *lpCreateStructA, ATOM classAtom, BOOL fUnicode)
-                    : Win32BaseWindow(OBJTYPE_WINDOW)
+                    : Win32BaseWindow()
 {
     isUnicode = fUnicode;
@@ -73 +73 @@
         DefWindowProcA(Msg, wParam, lParam);
         menuModifyItem();
-        if( client->getMaximizedChild() == this )
+        if( client->getMaximizedChild() == getWindowHandle() )
                 client->updateFrameText(MDI_REPAINTFRAME, NULL);
         return 0;
@@ -93 +93 @@
 
     case WM_SETFOCUS:
-        if(client->getActiveChild() != this )
+        if(client->getActiveChild() != getWindowHandle() )
             client->childActivate(this);
         break;
@@ -108 +108 @@
         {
         case SC_MOVE:
-            if( client->getMaximizedChild() == this)
+            if( client->getMaximizedChild() == getWindowHandle())
             {
                 return 0;
@@ -119 +119 @@
 
         case SC_MAXIMIZE:
-            if( client->getMaximizedChild() == this)
+            if( client->getMaximizedChild() == getWindowHandle())
             {
                   return client->SendMessageA(Msg, wParam, lParam);
@@ -145 +145 @@
     case WM_SIZE:
         /* do not change */
-        if( client->getActiveChild() == this && wParam != SIZE_MAXIMIZED )
+        if( client->getActiveChild() == getWindowHandle() && wParam != SIZE_MAXIMIZED )
         {
             client->setMaximizedChild(NULL);
-            client->restoreFrameMenu(this);
+            client->restoreFrameMenu(getWindowHandle());
             client->updateFrameText(MDI_REPAINTFRAME, NULL );
         }
@@ -154 +154 @@
         if( wParam == SIZE_MAXIMIZED )
         {
-            Win32MDIChildWindow *maxChild = client->getMaximizedChild();
-
-            if( maxChild == this ) break;
+            HWND maxChild = client->getMaximizedChild();
+
+            if( maxChild == getWindowHandle() ) break;
 
             if( maxChild)
             {
-                maxChild->SendMessageA(WM_SETREDRAW, FALSE, 0L );
+                ::SendMessageA(maxChild, WM_SETREDRAW, FALSE, 0L );
                 client->restoreFrameMenu(maxChild);
-                maxChild->ShowWindow(SW_SHOWNOACTIVATE);
-
-                maxChild->SendMessageA(WM_SETREDRAW, TRUE, 0L );
+                ::ShowWindow(maxChild, SW_SHOWNOACTIVATE);
+
+                ::SendMessageA(maxChild, WM_SETREDRAW, TRUE, 0L );
             }
 
-            client->setMaximizedChild(this);
-            client->setActiveChild(this);
-
-            client->augmentFrameMenu(this);
+            client->setMaximizedChild(getWindowHandle());
+            client->setActiveChild(getWindowHandle());
+
+            client->augmentFrameMenu(getWindowHandle());
 
             client->updateFrameText(MDI_REPAINTFRAME, NULL );
@@ -221 +221 @@
         DefWindowProcW(Msg, wParam, lParam);
         menuModifyItem();
-        if( client->getMaximizedChild() == this )
+        if( client->getMaximizedChild() == getWindowHandle() )
                 client->updateFrameText(MDI_REPAINTFRAME, NULL );
 
@@ -257 +257 @@
   WORD         wIDmenu = client->getFirstChildId() + client->getNrOfChildren();
   char         lpstrDef[]="junk!";
-  Win32MDIChildWindow *maximizedChild, *newchild;
+  Win32MDIChildWindow *newchild;
+  HWND         maximizedChild;
   CREATESTRUCTA createstruct;
   ATOM         classAtom;
@@ -287 +288 @@
         maximizedChild = client->getMaximizedChild();
 
-        maximizedChild->ShowWindow( SW_SHOWNOACTIVATE );
+        ::ShowWindow(maximizedChild, SW_SHOWNOACTIVATE );
 
         if( style & WS_MAXIMIZE )
@@ -379 +380 @@
                 if((newchild->getStyle() & WS_MAXIMIZE) && !client->getMaximizedChild() )
                 {
-                    client->setMaximizedChild(newchild);
-
-                    client->augmentFrameMenu(newchild);
+                    client->setMaximizedChild(newchild->getWindowHandle());
+
+                    client->augmentFrameMenu(newchild->getWindowHandle());
 
                     client->updateFrameText(MDI_REPAINTFRAME, NULL );
@@ -400 +401 @@
 
         maximizedChild = client->getMaximizedChild();
-        if( maximizedChild && maximizedChild->IsWindow() )
-            maximizedChild->ShowWindow(SW_SHOWMAXIMIZED);
+        if( ::IsWindow(maximizedChild) )
+            ::ShowWindow(maximizedChild, SW_SHOWMAXIMIZED);
 
         dprintf(("MDI child creation failed!!"));
@@ -456 +457 @@
      * sequence and in the menu child list */
 
+    lock();
     for( index = id+1; index <= client->getNrOfChildren() +
          client->getFirstChildId(); index++ )
     {
-        Win32MDIChildWindow *tmpWnd = client->getChildByID(index);
+        Win32MDIChildWindow *tmpWnd = (Win32MDIChildWindow *)GetWindowFromHandle(client->getChildByID(index));
         if( !tmpWnd )
         {
-          dprintf(("no window for id=%i\n",index));
-          continue;
+            dprintf(("no window for id=%i\n",index));
+            continue;
         }
 
@@ -473 +475 @@
             lstrcpynA(buffer + n, tmpWnd->getWindowNameA(), sizeof(buffer) - n );
 
+        RELEASE_WNDOBJ(tmpWnd);
+
+        unlock();
         /* change menu */
         ModifyMenuA(client->getMDIMenu(), index ,MF_BYCOMMAND | MF_STRING,
                     index - 1 , buffer );
-    }
+        lock();
+    }
+    unlock();
     return TRUE;
 }