Changeset 1299 for trunk/src

Timestamp:

Oct 14, 1999, 9:31:32 PM (26 years ago)

Author:

sandervl

Message:

Window rectange fixes + partly implemented CopyImage

Location:

trunk/src/user32

Files:

• loadres.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.8 1999-10-08 19:34:25 dengert Exp $ */
+/* $Id: loadres.cpp,v 1.9 1999-10-14 19:31:29 sandervl Exp $ */
 
 /*
@@ -439 +439 @@
   return(hRet);
 }
-//******************************************************************************
-//******************************************************************************
+/******************************************************************************
+ * CopyImage32 [USER32.61]  Creates new image and copies attributes to it
+ *
+ * PARAMS
+ *    hnd      [I] Handle to image to copy
+ *    type     [I] Type of image to copy
+ *    desiredx [I] Desired width of new image
+ *    desiredy [I] Desired height of new image
+ *    flags    [I] Copy flags
+ *
+ * RETURNS
+ *    Success: Handle to newly created image
+ *    Failure: NULL
+ *
+ * FIXME: implementation still lacks nearly all features, see LR_*
+ * defines in windows.h
+ *
+ */
+HICON WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
+                             INT desiredy, UINT flags )
+{
+    dprintf(("CopyImage %x %d (%d,%d) %x", hnd, type, desiredx, desiredy, flags));
+    switch (type)
+    {
+//      case IMAGE_BITMAP:
+//              return BITMAP_CopyBitmap(hnd);
+        case IMAGE_ICON:
+                return CopyIcon(hnd);
+        case IMAGE_CURSOR:
+                return CopyCursor(hnd);
+        default:
+                dprintf(("CopyImage: Unsupported type"));
+    }
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.28 1999-10-14 18:27:57 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.29 1999-10-14 19:31:30 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -881 +881 @@
   OSLibWinConvertStyle(dwStyle, &dwExStyle, &OSWinStyle, &OSFrameStyle, &borderWidth, &borderHeight);
 
+  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN);
+
   WinSetWindowULong(hwnd, QWL_STYLE,
                     (WinQueryWindowULong(hwnd, QWL_STYLE) & ~0xffff0000) |

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.27 1999-10-14 18:27:58 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.28 1999-10-14 19:31:31 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -298 +298 @@
                 hParent = win32wnd->getParent()->getOS2WindowHandle();
             else
-                hFrame = win32wnd->getOS2FrameWindowHandle();
+                hFrame = WinQueryWindow(hwnd, QW_PARENT);
         }
         OSLibMapSWPtoWINDOWPOS(pswp, &wp, pswpo, hParent, hFrame);
 
         SWP swpFrame;
-        WinQueryWindowPos(win32wnd->getOS2FrameWindowHandle(), &swpFrame);
+        WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swpFrame);
         dprintf(("WINDOWPOSCHANGE %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), win32wnd->getOS2FrameWindowHandle(),
                          swpFrame.fl,swpFrame.x, swpFrame.y, swpFrame.cx, swpFrame.cy));
         POINTL point;
+
         point.x = swpFrame.x;
         point.y = swpFrame.y;
-        WinMapWindowPoints(win32wnd->getOS2FrameWindowHandle(), HWND_DESKTOP,
-                           &point, 1);
-
+        if(win32wnd->getParent() != NULL)
+        {
+                WinMapWindowPoints(WinQueryWindow(hwnd, QW_PARENT), HWND_DESKTOP,
+                                   &point, 1);
+        }
+        point.y = OSLibQueryScreenHeight() - point.y - swpFrame.cy;
         win32wnd->setWindowRect(point.x, point.y, point.x+swpFrame.cx, point.y+swpFrame.cy);
         win32wnd->setClientRect(pswpo->x, pswpo->y, pswpo->x + pswpo->cx, pswpo->y + pswpo->cy);

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.41 1999-10-13 16:02:42 phaller Exp $ */
+/* $Id: user32.cpp,v 1.42 1999-10-14 19:31:31 sandervl Exp $ */
 
 /*
@@ -2317 +2317 @@
 #endif
 
-/* Resource Functions */
-
-HANDLE WIN32API CopyImage(HANDLE hImage, UINT uType, int cxDesired, int cyDesired, UINT fuFlags)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  CopyImage, not implemented\n");
-#endif
-  switch(uType) {
-    case IMAGE_BITMAP:
-    case IMAGE_CURSOR:
-    case IMAGE_ICON:
-    default:
-#ifdef DEBUG
-        WriteLog("USER32:  CopyImage, unknown type\n");
-#endif
-        return(NULL);
-  }
-  return(NULL);
-}
-
 /* Icon Functions */
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.42 1999-10-14 18:27:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.43 1999-10-14 19:31:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1963 +1963 @@
     }
 
+#if 0
+    if(showstate & SWPOS_SHOW && (getStyle() & WS_VISIBLE) == 0) {
+        SetWindowLongA(GWL_STYLE, getStyle() | WS_VISIBLE);
+    }
+#endif
     BOOL rc = OSLibWinShowWindow(OS2HwndFrame, showstate);
     return rc;