Changeset 383 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Jul 24, 1999, 2:39:53 PM (26 years ago)

Author:

sandervl

Message:

Some bugfixes

File:

• trunk/src/user32/new/win32wnd.cpp (modified) (5 diffs)

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.18 1999-07-20 15:46:54 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.19 1999-07-24 12:39:53 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -110 +110 @@
 Win32Window::~Win32Window()
 {
+  OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
+  OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
+
   if(Win32Hwnd)
-        HMHandleFree(Win32Hwnd);
+        HMHandleFree(Win32Hwnd & 0xFFFF);
   if(windowName)
         free(windowName);
@@ -394 +397 @@
   //Set icon from class
   if(windowClass->getIcon())
-        SetIcon(windowClass->getIcon());
+    SetIcon(windowClass->getIcon());
 
   /* Send the WM_CREATE message
@@ -423 +426 @@
                 HOOK_CallHooks16( WH_SHELL, HSHELL_WINDOWCREATED, hwnd, 0 );
 #endif
-        SetLastError(0);
+    SetLastError(0);
         return TRUE;
         }
@@ -656 +659 @@
 ULONG Win32Window::MsgClose()
 {
-  return SendInternalMessageA(WM_CLOSE, 0, 0);
+  if(SendInternalMessageA(WM_CLOSE, 0, 0) == 0) {
+        return 0; //app handles this message
+  }
+  delete this;
+  return 1;
 }
 //******************************************************************************