Changeset 2388 for trunk/src

Timestamp:

Jan 9, 2000, 5:52:55 PM (26 years ago)

Author:

sandervl

Message:

titlebar/sysmenu fixes + LoadBitmap fix for system bitmaps

Location:

trunk/src/user32

Files:

• loadres.cpp (modified) (4 diffs)
• user32.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbasepaint.cpp (modified) (14 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.19 2000-01-09 15:56:02 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.20 2000-01-09 16:52:53 sandervl Exp $ */
 
 /*
@@ -23 +23 @@
 #include <heapstring.h>
 #include <oslibres.h>
-#include <winconst.h>
 #include <win\virtual.h>
 #include "dib.h"
@@ -237 +236 @@
    switch(*id)
    {
-        case OBM_UPARROW_W:
-        case OBM_DNARROW_W:
-        case OBM_RGARROW_W:
-        case OBM_LFARROW_W:
-        case OBM_RESTORE_W:
-        case OBM_RESTORED_W:
-        case OBM_UPARROWD_W:
-        case OBM_DNARROWD_W:
-        case OBM_RGARROWD_W:
-        case OBM_LFARROWD_W:
-        case OBM_OLD_UPARROW_W:
-        case OBM_OLD_DNARROW_W:
-        case OBM_OLD_RGARROW_W:
-        case OBM_OLD_LFARROW_W:
-        case OBM_CHECK_W:
-        case OBM_CHECKBOXES_W:
-        case OBM_BTNCORNERS_W:
-        case OBM_COMBO_W:
-        case OBM_REDUCE_W:
-        case OBM_REDUCED_W:
-        case OBM_ZOOM_W:
-        case OBM_ZOOMD_W:
-        case OBM_SIZE_W:
-        case OBM_CLOSE_W:
-        case OBM_MNARROW_W:
-        case OBM_UPARROWI_W:
-        case OBM_DNARROWI_W:
-        case OBM_RGARROWI_W:
-        case OBM_LFARROWI_W:
-                return TRUE;
-
-        //TODO: Not supported by Open32. Replacement may not be accurate
-        case OBM_OLD_CLOSE_W:
-                *id = OBM_CLOSE_W;
-                return TRUE;
-
-        case OBM_BTSIZE_W:
-                *id = OBM_SIZE_W;
-                return TRUE;
-
-        case OBM_OLD_REDUCE_W:
-                *id = OBM_REDUCE_W;
-                return TRUE;
-
-        case OBM_OLD_ZOOM_W:
-                *id = OBM_ZOOM_W;
-                return TRUE;
-
-        case OBM_OLD_RESTORE_W:
-                *id = OBM_RESTORE_W;
+        case OBM_UPARROW:
+        case OBM_DNARROW:
+        case OBM_RGARROW:
+        case OBM_LFARROW:
+        case OBM_RESTORE:
+        case OBM_RESTORED:
+        case OBM_UPARROWD:
+        case OBM_DNARROWD:
+        case OBM_RGARROWD:
+        case OBM_LFARROWD:
+        case OBM_OLD_UPARROW:
+        case OBM_OLD_DNARROW:
+        case OBM_OLD_RGARROW:
+        case OBM_OLD_LFARROW:
+        case OBM_CHECK:
+        case OBM_CHECKBOXES:
+        case OBM_BTNCORNERS:
+        case OBM_COMBO:
+        case OBM_REDUCE:
+        case OBM_REDUCED:
+        case OBM_ZOOM:
+        case OBM_ZOOMD:
+        case OBM_SIZE:
+        case OBM_CLOSE:
+        case OBM_MNARROW:
+        case OBM_UPARROWI:
+        case OBM_DNARROWI:
+        case OBM_RGARROWI:
+        case OBM_LFARROWI:
+        case OBM_CLOSED:
+        case OBM_OLD_CLOSE:
+        case OBM_BTSIZE:
+        case OBM_OLD_REDUCE:
+        case OBM_OLD_ZOOM:
+        case OBM_OLD_RESTORE:
                 return TRUE;
 
@@ -396 +380 @@
          hBitmap =  LoadBitmapA(hInstanceUser32, lpszBitmap, 0, 0, 0);
     } 
-    else hBitmap = 0;
   } 
-  else hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
+  if(!hBitmap) 
+        hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
 
   dprintf(("LoadBitmapA returned %08xh\n", hBitmap));

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.63 1999-12-24 18:39:11 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.64 2000-01-09 16:52:53 sandervl Exp $ */
 
 /*
@@ -841 +841 @@
         break;
     }
-    dprintf(("USER32:  GetSystemMetrics %d returned %d\n", nIndex, rc));
+    dprintf2(("USER32:  GetSystemMetrics %d returned %d\n", nIndex, rc));
     return(rc);
 }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.136 2000-01-09 15:56:04 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.137 2000-01-09 16:52:54 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -878 +878 @@
 {
   lastHitTestVal = SendInternalMessageA(WM_NCHITTEST, 0, MAKELONG((USHORT)x, (USHORT)y));
-  dprintf(("MsgHitTest (%d,%d) (%d,%d) (%d,%d) returned %x", x, y, rectWindow.left, rectWindow.right, rectWindow.top, rectWindow.bottom, lastHitTestVal));
+  dprintf2(("MsgHitTest (%d,%d) (%d,%d) (%d,%d) returned %x", x, y, rectWindow.left, rectWindow.right, rectWindow.top, rectWindow.bottom, lastHitTestVal));
   return lastHitTestVal;
 }
@@ -959 +959 @@
  BOOL  fClick = FALSE;
 
-    dprintf(("MsgButton at (%d,%d)", msg->pt.x, msg->pt.y));
+    dprintf2(("MsgButton at (%d,%d)", msg->pt.x, msg->pt.y));
     switch(msg->message) {
         case WM_LBUTTONDBLCLK:

trunk/src/user32/win32wbasepaint.cpp

@@ -1 @@
-/* $Id: win32wbasepaint.cpp,v 1.2 2000-01-09 15:56:05 sandervl Exp $ */
+/* $Id: win32wbasepaint.cpp,v 1.3 2000-01-09 16:52:55 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -121 +121 @@
     state = GetMenuState(hSysMenu, SC_MAXIMIZE, MF_BYCOMMAND);
   }
-  SetCapture(Win32Hwnd);
-  hdc = GetWindowDC(Win32Hwnd);
+  SetCapture(getWindowHandle());
+  hdc = GetWindowDC(getWindowHandle());
   if (wParam == HTMINBUTTON)
     DrawMinButton(hdc,TRUE,FALSE);
@@ -132 +132 @@
     BOOL oldstate = pressed;
 
-    GetMessageA(&msg,Win32Hwnd,0,0);
+    GetMessageA(&msg, getWindowHandle(), 0, 0);
     pressed = (HandleNCHitTest(msg.pt) == wParam);
     if (pressed != oldstate)
@@ -143 +143 @@
   }
 
-  while (msg.message != WM_LBUTTONUP);
+  while (msg.message != WM_NCLBUTTONUP);
 
   if (wParam == HTMINBUTTON)
@@ -151 +151 @@
 
   ReleaseCapture();
-  ReleaseDC(Win32Hwnd,hdc);
+  ReleaseDC(getWindowHandle(), hdc);
   /* If the item minimize or maximize of the sysmenu are not there */
   /* or if the style is not present, do nothing */
@@ -179 +179 @@
   if((state & MF_DISABLED) || (state & MF_GRAYED) || (state == 0xFFFFFFFF))
     return;
-  hdc = GetWindowDC(Win32Hwnd);
-  SetCapture(Win32Hwnd);
+  hdc = GetWindowDC(getWindowHandle());
+  SetCapture(getWindowHandle());
   DrawCloseButton(hdc,TRUE,FALSE);
   do
@@ -186 +186 @@
     BOOL oldstate = pressed;
 
-    GetMessageA(&msg,Win32Hwnd,0,0);
+    GetMessageA(&msg, getWindowHandle(), 0, 0);
     pressed = (HandleNCHitTest(msg.pt) == wParam);
+
     if (pressed != oldstate)
       DrawCloseButton(hdc, pressed, FALSE);
-  } while (msg.message != WM_LBUTTONUP);
+  }
+  while (msg.message != WM_NCLBUTTONUP);
+
   DrawCloseButton(hdc,FALSE,FALSE);
   ReleaseCapture();
-  ReleaseDC(Win32Hwnd,hdc);
-  if (!pressed) return;
+  ReleaseDC(getWindowHandle(), hdc);
+
+  if (!pressed)
+        return;
+
   SendInternalMessageA(WM_SYSCOMMAND,SC_CLOSE,*(LPARAM*)&msg.pt);
 }
@@ -551 +557 @@
     if(hIcon == 0)
       if (!(dwStyle & DS_MODALFRAME))
-        hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_WINEICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+        hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_ODINICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
 
     if (hIcon)
@@ -594 +600 @@
   HDC hdcMem;
 
-  if( !(flags & WIN_MANAGED) )
-  {
     BITMAP bmp;
     HBITMAP hBmp, hOldBmp;
@@ -616 +620 @@
     SelectObject (hdcMem, hOldBmp);
     DeleteDC (hdcMem);
-  }
 }
 //******************************************************************************
@@ -625 +628 @@
   HDC hdcMem;
 
-  if( !(flags & WIN_MANAGED))
-  {
     BITMAP  bmp;
     HBITMAP  hBmp,hOldBmp;
@@ -652 +653 @@
     SelectObject (hdcMem, hOldBmp);
     DeleteDC( hdcMem );
-  }
 }
 //******************************************************************************
@@ -661 +661 @@
   HDC hdcMem;
 
-  if( !(flags & WIN_MANAGED))
-
-  {
     BITMAP  bmp;
     HBITMAP  hBmp,hOldBmp;
@@ -692 +689 @@
     SelectObject (hdcMem, hOldBmp);
     DeleteDC( hdcMem );
-  }
 }
 //******************************************************************************