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

Timestamp:

Jul 17, 1999, 11:17:58 AM (26 years ago)

Author:

sandervl

Message:

Lots of changes/additions

File:

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

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.4 1999-07-16 11:32:09 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.5 1999-07-17 09:17:58 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -68 +68 @@
   magic            = WIN32PM_MAGIC;
   OS2Hwnd          = 0;
+  OS2HwndFrame     = 0;
   OS2HwndMenu      = 0;
   Win32Hwnd        = 0;
@@ -92 +93 @@
   hwndLinkAfter    = HWND_BOTTOM;
   flags            = 0;
+  isIcon           = FALSE;
   owner            = NULL;
   windowClass      = 0;
@@ -329 +331 @@
                                  cs->x, cs->y, cs->cx, cs->cy,
                                  (owner) ? owner->getOS2WindowHandle() : 0,
-                                 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE);
+                                 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE, &OS2HwndFrame);
 
   if(OS2Hwnd == 0) {
@@ -665 +667 @@
 ULONG Win32Window::MsgDestroy()
 {
-  return SendMessageA(WM_DESTROY, 0, 0);
+ ULONG rc;
+
+  rc = SendMessageA(WM_DESTROY, 0, 0);
+  delete this;
+  return rc;
 }
 //******************************************************************************
@@ -687 +693 @@
 }
 //******************************************************************************
+//TODO: Send WM_NCCALCSIZE message here and correct size if necessary
 //******************************************************************************
 ULONG Win32Window::MsgSize(ULONG width, ULONG height, BOOL fMinimize, BOOL fMaximize)
@@ -911 +918 @@
    if(HMHandleTranslateToOS2(hMenu, (PULONG)&menutemplate) == NO_ERROR) 
    {
-        OS2HwndMenu = OSLibWinCreateMenu(OS2Hwnd, menutemplate);
+        OS2HwndMenu = OSLibWinCreateMenu(OS2HwndFrame, menutemplate);
         if(OS2HwndMenu == 0) {
                 dprintf(("Win32Window::SetMenu OS2HwndMenu == 0"));
@@ -924 +931 @@
 BOOL Win32Window::ShowWindow(ULONG nCmdShow)
 {
-  return O32_ShowWindow(OS2Hwnd, nCmdShow);
+ ULONG showstate = 0;
+
+  switch(nCmdShow)
+  {
+        case SW_SHOW:
+        case SW_SHOWDEFAULT: //todo
+                showstate = SWPOS_SHOW;
+                break;
+        case SW_HIDE:
+                showstate = SWPOS_HIDE;
+                break;
+        case SW_MINIMIZE:
+                showstate = SWPOS_MINIMIZE;
+                break;
+        case SW_SHOWMAXIMIZED:
+                showstate = SWPOS_MAXIMIZE | SWPOS_SHOW;
+                break;
+        case SW_SHOWMINIMIZED:
+                showstate = SWPOS_MINIMIZE | SWPOS_SHOW;
+                break;
+        case SW_SHOWMINNOACTIVE:  //TODO
+                showstate = SWPOS_MINIMIZE | SWPOS_SHOW;
+                break;
+        case SW_SHOWNA: //TODO
+                showstate = SWPOS_SHOW;
+                break;
+        case SW_SHOWNOACTIVATE:  //TODO
+                showstate = SWPOS_SHOW;
+                break;
+        case SW_SHOWNORMAL:
+                showstate = SWPOS_RESTORE;
+                break;
+  }
+  return OSLibWinShowWindow(OS2HwndFrame, showstate);
 }
 //******************************************************************************
@@ -931 +971 @@
 {
  Win32Window *window;
+ ULONG        setstate = 0;
 
   switch(hwndInsertAfter) {
@@ -950 +991 @@
                 
   }
-  return O32_SetWindowPos(OS2Hwnd, hwndInsertAfter, x, y, cx, cy, fuFlags);
-}
+  setstate = SWPOS_MOVE | SWPOS_SIZE | SWPOS_ACTIVATE | SWPOS_ZORDER;
+  if(fuFlags & SWP_DRAWFRAME)
+        setstate |= 0; //TODO
+  if(fuFlags & SWP_FRAMECHANGED)
+        setstate |= 0; //TODO
+  if(fuFlags & SWP_HIDEWINDOW)
+        setstate &= ~SWPOS_ZORDER;
+  if(fuFlags & SWP_NOACTIVATE)
+        setstate &= ~SWPOS_ACTIVATE;
+  if(fuFlags & SWP_NOCOPYBITS)
+        setstate |= 0;          //TODO
+  if(fuFlags & SWP_NOMOVE)
+        setstate &= ~SWPOS_MOVE;
+  if(fuFlags & SWP_NOSIZE)
+        setstate &= ~SWPOS_SIZE;
+  if(fuFlags & SWP_NOREDRAW)
+        setstate |= SWPOS_NOREDRAW;
+  if(fuFlags & SWP_NOZORDER)
+        setstate &= ~SWPOS_ZORDER;
+  if(fuFlags & SWP_SHOWWINDOW)
+        setstate |= SWPOS_SHOW;
+
+  return OSLibWinSetWindowPos(OS2HwndFrame, hwndInsertAfter, x, y, cx, cy, setstate);
+}
+//******************************************************************************
+//Also destroys all the child windows (destroy parent, destroy children)
 //******************************************************************************
 BOOL Win32Window::DestroyWindow()
 {
-  return TRUE;
+  return OSLibWinDestroyWindow(OS2HwndFrame);
 }
 //******************************************************************************
@@ -1015 +1080 @@
  HWND topchild;
 
-  topchild = OSLibWinQueryTopMostChildWindow(OS2Hwnd);
+  topchild = OSLibWinQueryTopMostChildWindow(OS2HwndFrame);
   if(topchild)
-  {//TODO
+  {
         return topchild;
   }
@@ -1023 +1088 @@
 }
 //******************************************************************************
-//TODO
+//Don't call WinUpdateWindow as that one also updates the child windows
+//Also need to send WM_PAINT directly to the window procedure, which doesn't
+//always happen with WinUpdateWindow (could be posted if thread doesn't own window)
 //******************************************************************************
 BOOL Win32Window::UpdateWindow()
 {  
+ RECTL rect;
+
+  if(OSLibWinQueryUpdateRect(OS2Hwnd, (PVOID)&rect))
+  {//update region not empty
+        SendMessageA((isIcon) ? WM_PAINTICON : WM_PAINT, 0, 0);
+  }
   return TRUE;
 }
 //******************************************************************************
-//TODO
 //******************************************************************************
 BOOL Win32Window::IsIconic()
 {
-  return FALSE;
+  return OSLibWinIsIconic(OS2HwndFrame);
 }
 //******************************************************************************
@@ -1144 +1216 @@
  Win32Window *window;
 
-   if(HIWORD(hwnd) != 0x6800)
+   if(HIWORD(hwnd) != 0x6800) {
         return NULL;
+   }
 
    if(HMHandleTranslateToOS2(LOWORD(hwnd), (PULONG)&window) == NO_ERROR) {