Changeset 7063 for trunk/src/user32

Timestamp:

Oct 15, 2001, 7:10:55 PM (24 years ago)

Author:

sandervl

Message:

custom build update

Location:

trunk/src/user32

Files:

• oslibres.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• syscolor.cpp (modified) (2 diffs)
• user32lib.mak (added)
• win32wbasenonclient.cpp (modified) (2 diffs)
• winicon.cpp (modified) (2 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.24 2001-10-14 21:37:03 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.25 2001-10-15 17:09:03 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -308 +308 @@
     if(lHits == GPI_ERROR) goto fail;
 
-#ifdef DEBUG
+//DEBUG_CURSOR
+#ifdef DEBUG_CURSOR
  {
     dprintf(("colorToMonoBitmap %d %d (%x,%x,%x)(%x,%x,%x)", pBmpDest->cx, pBmpDest->cy, bmpinfo->argbColor[0].bRed, bmpinfo->argbColor[0].bGreen, bmpinfo->argbColor[0].bBlue, bmpinfo->argbColor[1].bRed, bmpinfo->argbColor[1].bGreen, bmpinfo->argbColor[1].bBlue));

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.108 2001-07-29 18:59:27 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.109 2001-10-15 17:09:03 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -157 +157 @@
   }
 
-#if 0
-  hwndControl = WinWindowFromID(hwndFrame, FID_SYSMENU);
-  if(hwndControl) {
-      swp[i].hwnd = hwndControl;
-      swp[i].hwndInsertBehind = HWND_TOP;
-      swp[i].x  = pRect->xLeft;
-      swp[i].y  = pRect->yBottom;
-      if(pRect->yTop - pRect->yBottom > minmaxheight) {
-          swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
+  if(fOS2Look == OS2_APPEARANCE_SYSMENU) {
+      hwndControl = WinWindowFromID(hwndFrame, FID_SYSMENU);
+      if(hwndControl) {
+          swp[i].hwnd = hwndControl;
+          swp[i].hwndInsertBehind = HWND_TOP;
+          swp[i].x  = pRect->xLeft;
+          swp[i].y  = pRect->yBottom;
+          if(pRect->yTop - pRect->yBottom > minmaxheight) {
+              swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
+          }
+          swp[i].cx = minmaxwidth/2;
+          swp[i].cy = minmaxheight;;
+          swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+          dprintf(("FID_SYSMENU (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
+          pRect->xLeft += minmaxwidth/2;
+          i++;
       }
-      swp[i].cx = minmaxwidth/2;
-      swp[i].cy = minmaxheight;;
-      swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
-      dprintf(("FID_SYSMENU (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
-      pRect->xLeft += minmaxwidth/2;
-      i++;
-  }
-#else
+  }
+  else
   if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W) && hSysMenuIcon) {
       pRect->xLeft += minmaxwidth/2;
   }
-#endif
+
   if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
       hwndControl = WinWindowFromID(hwndFrame, FID_TITLEBAR);

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.154 2001-10-08 12:19:10 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.155 2001-10-15 17:09:04 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -183 +183 @@
 BOOL MENU_Init();
 //******************************************************************************
-void WIN32API SetWindowAppearance(BOOL fLooks)
+void WIN32API SetWindowAppearance(int fLooks)
 {
-    if(fLooks) {
+    if(fLooks == OS2_APPEARANCE || fLooks == OS2_APPEARANCE_SYSMENU) 
+    {
         CHAR szDisplay[30];
         HMODULE hModDisplay;

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.29 2001-08-27 08:42:11 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.30 2001-10-15 17:09:04 sandervl Exp $ */
 
 /*
@@ -193 +193 @@
         else    SYSCOLOR_SetColor(x,SysColors[x]);
   }
+  fColorInit = TRUE;
 }
 //******************************************************************************

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.36 2001-10-03 18:37:53 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.37 2001-10-15 17:09:04 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -889 +889 @@
 
   if(fOS2Look) {
-      if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW))
+      if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW) &&
+           fOS2Look != OS2_APPEARANCE_SYSMENU)
       {
          HICON hSysIcon = IconForWindow(ICON_SMALL);

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.31 2001-10-14 20:55:46 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.32 2001-10-15 17:09:05 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -442 +442 @@
     }
 
+    dprintf2(("OSLibWinSetPointer %x", iconinfo->hColorBmp));
     if(OSLibWinSetPointer(iconinfo->hColorBmp) == FALSE) {
         dprintf(("OSLibWinSetPointer %x returned FALSE!!", iconinfo->hColorBmp));