Changeset 5935 for trunk/src/user32/win32dlg.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/win32dlg.cpp (modified) (5 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.65 2001-05-25 16:59:11 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.66 2001-06-09 14:50:20 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -39 +39 @@
 Win32Dialog::Win32Dialog(HINSTANCE hInst, LPCSTR dlgTemplate, HWND owner,
                          DLGPROC dlgProc, LPARAM param, BOOL isUnicode)
-                    : Win32BaseWindow(OBJTYPE_DIALOG)
+                    : Win32BaseWindow()
 {
   RECT rect;
@@ -312 +312 @@
     /* Owner must be a top-level window */
     if(getOwner() == NULL) {
+         windowDesktop->addRef();
          topOwner = windowDesktop;
     }
-    else topOwner = getOwner()->GetTopParent();
+    else topOwner = GetWindowFromHandle(getOwner()->GetTopParent());
 
     if(topOwner == NULL) {
@@ -415 +416 @@
         topOwner->setOS2HwndModalDialog(hwndOldDialog);
         if (!bOldOwner) topOwner->EnableWindow(TRUE);
+        RELEASE_WNDOBJ(topOwner);
     }
     retval = idResult;
@@ -869 +871 @@
                     CONTROLS_IsControl( wndFocus->getParent(), COMBOBOX_CONTROL ))
                     wndFocus->SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
+                RELEASE_WNDOBJ(wndFocus);
             }
         }