Changeset 500 for trunk/src

Timestamp:

Aug 15, 1999, 9:11:02 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

Location:

trunk/src/user32/new

Files:

• button.cpp (modified) (13 diffs)
• combo.cpp (modified) (8 diffs)
• edit.cpp (modified) (7 diffs)
• listbox.cpp (modified) (21 diffs)
• scroll.cpp (modified) (15 diffs)
• static.cpp (modified) (5 diffs)
• uitools.cpp (modified) (9 diffs)

trunk/src/user32/new/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.10 1999-07-27 16:14:22 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.11 1999-08-15 19:11:00 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -31 +31 @@
 static void OB_Paint(HWND hwnd,HDC hDC,WORD action);
 static void BUTTON_CheckAutoRadioButton(HWND hwnd);
+static void BUTTON_DrawPushButton(HWND hwnd,HDC hDC,WORD action,BOOL pushedState);
 static LRESULT BUTTON_LButtonDown(HWND hwnd,WPARAM wParam,LPARAM lParam);
 
@@ -181 +182 @@
 {
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-
-  switch(dwStyle & 0x0f)
-  {
-    case BS_RADIOBUTTON:
-    case BS_AUTORADIOBUTTON:
-    case BS_OWNERDRAW:
-      SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID),BN_DOUBLECLICKED),hwnd);
-      break;
-
-    default:
-      BUTTON_LButtonDown(hwnd,wParam,lParam);
-      break;
-  }
+  DWORD style = dwStyle & 0x0f;
+
+  if(dwStyle & BS_NOTIFY || style == BS_RADIOBUTTON ||
+     style == BS_USERBUTTON || style == BS_OWNERDRAW)
+    SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID),BN_DOUBLECLICKED),hwnd);
+  else BUTTON_LButtonDown(hwnd,wParam,lParam);
 
   return 0;
@@ -200 +194 @@
 static LRESULT BUTTON_LButtonDown(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
+  SetCapture(hwnd);
+  SetFocus(hwnd);
   SendMessageA(hwnd,BM_SETSTATE,TRUE,0);
-  SetFocus(hwnd);
-  SetCapture(hwnd);
 
   return 0;
@@ -355 +349 @@
   DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
 
-  infoPtr->state |= BUTTON_HASFOCUS;
-  if (style == BS_AUTORADIOBUTTON)
-  {
-    SendMessageA(hwnd,BM_SETCHECK,1,0);
-    SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID),BN_CLICKED),hwnd);
-  } else if (style == BS_RADIOBUTTON)
-  {
+  if ((style == BS_AUTORADIOBUTTON || style == BS_RADIOBUTTON) &&
+      (GetCapture() != hwnd) && !(SendMessageA(hwnd,BM_GETCHECK,0,0) & BST_CHECKED))
+  {
+    /* The notification is sent when the button (BS_AUTORADIOBUTTON)
+       is unckecked and the focus was not given by a mouse click. */
+    if (style == BS_AUTORADIOBUTTON) SendMessageA(hwnd,BM_SETCHECK,TRUE,0);
     SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID),BN_CLICKED),hwnd);
   }
 
+  infoPtr->state |= BUTTON_HASFOCUS;
   PAINT_BUTTON(hwnd,style,ODA_FOCUS);
 
@@ -424 +418 @@
   HANDLE oldHbitmap = infoPtr->hImage;
 
-  if (dwStyle & BS_BITMAP) infoPtr->hImage = (HANDLE)lParam;
+  if (dwStyle & BS_BITMAP || dwStyle & BS_ICON) infoPtr->hImage = (HANDLE)lParam;
 
   return oldHbitmap;
@@ -433 +427 @@
   BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
 
-  return infoPtr->hImage;
+  switch(wParam)
+  {
+    case IMAGE_BITMAP:
+      return (HBITMAP)infoPtr->hImage;
+    case IMAGE_ICON:
+      return (HICON)infoPtr->hImage;
+    default:
+      return NULL;
+  }
 }
 
@@ -600 +602 @@
  *       Push Button Functions
  */
-
-static void PB_Paint(HWND hwnd,HDC hDC,WORD action)
-{
-    BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
-    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-    RECT rc;
+static void PB_Paint( HWND hwnd, HDC hDC, WORD action )
+{
+    BUTTONINFO *infoPtr      = (BUTTONINFO *)GetInfoPtr(hwnd);
+    BOOL        bHighLighted = (infoPtr->state & BUTTON_HIGHLIGHTED);
+
+    /*
+     * Delegate this to the more generic pushbutton painting
+     * method.
+     */
+    BUTTON_DrawPushButton(hwnd,
+                          hDC,
+                          action,
+                          bHighLighted);
+}
+
+/**********************************************************************
+ * This method will actually do the drawing of the pushbutton
+ * depending on it's state and the pushedState parameter.
+ */
+static void BUTTON_DrawPushButton(
+  HWND hwnd,
+  HDC  hDC,
+  WORD action,
+  BOOL pushedState )
+{
+    RECT rc, focus_rect;
     HPEN hOldPen;
     HBRUSH hOldBrush;
+    BUTTONINFO *infoPtr = (BUTTONINFO *)GetInfoPtr(hwnd);
+    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
     int xBorderOffset, yBorderOffset;
     xBorderOffset = yBorderOffset = 0;
@@ -613 +637 @@
     char* text;
 
-    GetClientRect(hwnd,&rc );
+    GetClientRect( hwnd, &rc );
 
       /* Send WM_CTLCOLOR to allow changing the font (the colors are fixed) */
     if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
-    SendMessageA(GetParent(hwnd),WM_CTLCOLORBTN,hDC,hwnd);
-
+    BUTTON_SEND_CTLCOLOR( hwnd, hDC );
     hOldPen = (HPEN)SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
     hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE));
     SetBkMode(hDC, TRANSPARENT);
-    Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom);
-/*    if (action == ODA_DRAWENTIRE)*/
-    {
-        SetPixel( hDC, rc.left, rc.top, GetSysColor(COLOR_WINDOW) );
-        SetPixel( hDC, rc.left, rc.bottom-1, GetSysColor(COLOR_WINDOW) );
-        SetPixel( hDC, rc.right-1, rc.top, GetSysColor(COLOR_WINDOW) );
-        SetPixel( hDC, rc.right-1, rc.bottom-1, GetSysColor(COLOR_WINDOW));
-    }
-    InflateRect( &rc, -1, -1 );
 
     if ((dwStyle & 0x000f) == BS_DEFPUSHBUTTON)
     {
         Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom);
-        InflateRect( &rc, -1, -1 );
-    }
-
-    if (infoPtr->state & BUTTON_HIGHLIGHTED)
-    {
-        /* draw button shadow: */
-        SelectObject(hDC, GetSysColorBrush(COLOR_BTNSHADOW));
-        PatBlt(hDC, rc.left, rc.top, 1, rc.bottom-rc.top, PATCOPY );
-        PatBlt(hDC, rc.left, rc.top, rc.right-rc.left, 1, PATCOPY );
-        rc.left += 2;  /* To position the text down and right */
-        rc.top  += 2;
-    } else {
-        rc.right++, rc.bottom++;
-        DrawEdge( hDC, &rc, EDGE_RAISED, BF_RECT );
-
-        /* To place de bitmap correctly */
-        xBorderOffset += GetSystemMetrics(SM_CXEDGE);
-        yBorderOffset += GetSystemMetrics(SM_CYEDGE);
-
-        rc.right--, rc.bottom--;
-    }
-
-    /* draw button label, if any: */
+        InflateRect( &rc, -1, -1 );
+    }
+
+    UINT uState = DFCS_BUTTONPUSH;
+
+    if (pushedState)
+    {
+      if ( (dwStyle & 0x000f) == BS_DEFPUSHBUTTON )
+        uState |= DFCS_FLAT;
+      else
+        uState |= DFCS_PUSHED;
+    }
+
+    DrawFrameControl( hDC, &rc, DFC_BUTTON, uState );
+    InflateRect( &rc, -2, -2 );
+
+    focus_rect = rc;
+
+    if (pushedState)
+    {
+      rc.left += 2;  /* To position the text down and right */
+      rc.top  += 2;
+    }
+
+
+    /* draw button label, if any:
+     *
+     * In win9x we don't show text if there is a bitmap or icon.
+     * I don't know about win31 so I leave it as it was for win31.
+     * Dennis Björklund 12 Jul, 99
+     */
     textLen = GetWindowTextLengthA(hwnd);
-    if (textLen > 0)
+    if (textLen > 0 && (!(dwStyle & (BS_ICON|BS_BITMAP))))
     {
         LOGBRUSH lb;
@@ -668 +690 @@
         GetObjectA( GetSysColorBrush(COLOR_BTNFACE), sizeof(lb), &lb );
         if (dwStyle & WS_DISABLED &&
-            GetSysColor(COLOR_GRAYTEXT) == lb.lbColor)
+            GetSysColor(COLOR_GRAYTEXT)==lb.lbColor)
             /* don't write gray text on gray background */
             PaintGrayOnGray( hDC,infoPtr->hFont,&rc,text,
-                               DT_CENTER | DT_VCENTER );
+                               DT_CENTER | DT_VCENTER );
         else
         {
@@ -679 +701 @@
             DrawTextA( hDC, text, -1, &rc,
                          DT_SINGLELINE | DT_CENTER | DT_VCENTER );
-            /* do we have the focus? */
-            if (infoPtr->state & BUTTON_HASFOCUS)
-            {
-                RECT r = { 0, 0, 0, 0 };
-                INT xdelta, ydelta;
-
-                DrawTextA( hDC, text, -1, &r,
-                             DT_SINGLELINE | DT_CALCRECT );
-                xdelta = ((rc.right - rc.left) - (r.right - r.left) - 1) / 2;
-                ydelta = ((rc.bottom - rc.top) - (r.bottom - r.top) - 1) / 2;
-                if (xdelta < 0) xdelta = 0;
-                if (ydelta < 0) ydelta = 0;
-                InflateRect( &rc, -xdelta, -ydelta );
-                DrawFocusRect( hDC, &rc );
-            }
+            /* do we have the focus?
+             * Win9x draws focus last with a size prop. to the button
+             */
         }
         free(text);
     }
-
-    if((dwStyle & BS_BITMAP) && (infoPtr->hImage != NULL))
-    {
-        BITMAP bm;
-        HDC hdcMem;
-        int yOffset, xOffset, imageWidth, imageHeight;
-
-        GetObjectA (infoPtr->hImage, sizeof(BITMAP), &bm);
-
-        /* Center the bitmap */
-        xOffset = (((rc.right - rc.left) - 2*xBorderOffset) - bm.bmWidth ) / 2;
-        yOffset = (((rc.bottom - rc.top) - 2*yBorderOffset) - bm.bmHeight ) / 2;
-
-        imageWidth = bm.bmWidth;
-        imageHeight = bm.bmHeight;
-
-        /* If the image is to big for the button */
-        if (xOffset < 0)
+    if ( ((dwStyle & BS_ICON) || (dwStyle & BS_BITMAP) ) &&
+         (infoPtr->hImage != NULL) )
+    {
+        int yOffset, xOffset;
+        int imageWidth, imageHeight;
+
+        /*
+         * We extract the size of the image from the handle.
+         */
+        if (dwStyle & BS_ICON)
+        {
+            ICONINFO iconInfo;
+            BITMAP   bm;
+
+            GetIconInfo((HICON)infoPtr->hImage, &iconInfo);
+            GetObjectA (iconInfo.hbmColor, sizeof(BITMAP), &bm);
+        
+            imageWidth  = bm.bmWidth;
+            imageHeight = bm.bmHeight;
+
+            DeleteObject(iconInfo.hbmColor);
+            DeleteObject(iconInfo.hbmMask);
+
+        }
+        else
+        {
+            BITMAP   bm;
+
+            GetObjectA (infoPtr->hImage, sizeof(BITMAP), &bm);
+        
+            imageWidth  = bm.bmWidth;
+            imageHeight = bm.bmHeight;
+        }
+
+        /* Center the bitmap */
+        xOffset = (((rc.right - rc.left) - 2*xBorderOffset) - imageWidth ) / 2;
+        yOffset = (((rc.bottom - rc.top) - 2*yBorderOffset) - imageHeight) / 2;
+
+        /* If the image is too big for the button then create a region*/
+        if(xOffset < 0 || yOffset < 0)
+        {
+            HRGN hBitmapRgn = NULL;
+            hBitmapRgn = CreateRectRgn(
+                rc.left + xBorderOffset, rc.top +yBorderOffset,
+                rc.right - xBorderOffset, rc.bottom - yBorderOffset);
+            SelectClipRgn(hDC, hBitmapRgn);
+            DeleteObject(hBitmapRgn);
+        }
+
+        /* Let minimum 1 space from border */
+        xOffset++, yOffset++;
+
+        /*
+         * Draw the image now.
+         */
+        if (dwStyle & BS_ICON)
+        {
+            DrawIcon(hDC,
+                rc.left + xOffset, rc.top + yOffset,
+                     (HICON)infoPtr->hImage);
+        }
+        else
         {
-            imageWidth = rc.right - rc.left - 2*xBorderOffset -1;
-            xOffset = xBorderOffset;
+            HDC hdcMem;
+
+            hdcMem = CreateCompatibleDC (hDC);
+            SelectObject (hdcMem, (HBITMAP)infoPtr->hImage);
+            BitBlt(hDC,
+                   rc.left + xOffset,
+                   rc.top + yOffset,
+                   imageWidth, imageHeight,
+                   hdcMem, 0, 0, SRCCOPY);
+        
+            DeleteDC (hdcMem);
+        }
+
+        if(xOffset < 0 || yOffset < 0)
+        {
+            SelectClipRgn(hDC, NULL);
         }
-
-        if (yOffset < 0)
-        {
-            imageHeight = rc.bottom - rc.top - 2*yBorderOffset -1;
-            yOffset = yBorderOffset;
-        }
-
-        /* Let minimum 1 space from border */
-        xOffset++, yOffset++;
-
-        hdcMem = CreateCompatibleDC (hDC);
-        SelectObject (hdcMem, (HBITMAP)infoPtr->hImage);
-        BitBlt(hDC, rc.left + xOffset,
-               rc.top + yOffset,
-               imageWidth, imageHeight,
-               hdcMem, 0, 0, SRCCOPY);
-
-        DeleteDC (hdcMem);
-    }
+    }
+
+    if (infoPtr->state & BUTTON_HASFOCUS)
+    {
+        InflateRect( &focus_rect, -1, -1 );
+        DrawFocusRect( hDC, &focus_rect );
+    }
+
 
     SelectObject( hDC, hOldPen );
     SelectObject( hDC, hOldBrush );
 }
-
 
 /**********************************************************************
@@ -812 +868 @@
     char* text = NULL;
 
+    /*
+     * if the button has a bitmap/icon, draw a normal pushbutton
+     * instead of a radion button.
+     */
+    if (infoPtr->hImage!=NULL)
+    {
+        BOOL bHighLighted = ((infoPtr->state & BUTTON_HIGHLIGHTED) ||
+                             (infoPtr->state & BUTTON_CHECKED));
+
+        BUTTON_DrawPushButton(hwnd,
+                              hDC,
+                              action,
+                              bHighLighted);
+        return;
+    }
+
     textLen = 0;
     GetClientRect(hwnd, &client);
@@ -1019 +1091 @@
     dis.itemData   = 0;
     GetClientRect( hwnd, &dis.rcItem );
+
+    SetBkColor( hDC, GetSysColor( COLOR_BTNFACE ) );
+    FillRect( hDC,  &dis.rcItem, GetSysColorBrush( COLOR_BTNFACE ) );
+
     SendMessageA( GetParent(hwnd), WM_DRAWITEM,
                     GetWindowLongA(hwnd,GWL_ID), (LPARAM)&dis );

trunk/src/user32/new/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.2 1999-07-24 17:10:24 cbratschi Exp $ */
+/* $Id: combo.cpp,v 1.3 1999-08-15 19:11:00 cbratschi Exp $ */
 /*
  * Combo controls
@@ -39 +39 @@
  * Look and feel dependant "constants"
  */
+#define COMBO_YBORDERGAP         5
 #define COMBO_XBORDERSIZE()      ( 2 )
 #define COMBO_YBORDERSIZE()      ( 2 )
@@ -484 +485 @@
   if( lphc->owner || !(lpcs->style & WS_VISIBLE) )
   {
-      UINT      lbeStyle;
+      UINT lbeStyle   = 0;
+      UINT lbeExStyle = 0;
 
       /*
@@ -530 +532 @@
         lbeStyle |= LBS_DISABLENOSCROLL;
 
-      if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
-        lbeStyle |= WS_CHILD | WS_VISIBLE;
-      else                                      /* popup listbox */
-        lbeStyle |= WS_POPUP;
+      if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
+      {
+        lbeStyle |= WS_CHILD | WS_VISIBLE;
+
+        /*
+         * In win 95 look n feel, the listbox in the simple combobox has
+         * the WS_EXCLIENTEDGE style instead of the WS_BORDER style.
+         */
+        lbeStyle   &= ~WS_BORDER;
+        lbeExStyle |= WS_EX_CLIENTEDGE;
+      }
+      else                                      /* popup listbox */
+        lbeStyle |= WS_POPUP;
 
      /* Dropdown ComboLBox is not a child window and we cannot pass
       * ID_CB_LISTBOX directly because it will be treated as a menu handle.
       */
-      lphc->hWndLBox = CreateWindowExA(0,
+      lphc->hWndLBox = CreateWindowExA(lbeExStyle,
                                        clbName,
                                        NULL,
@@ -1063 +1074 @@
 {
    RECT rect;
+   int nItems = 0;
+   int i;
+   int nHeight;
+   int nDroppedHeight;
 
    //TRACE("[%04x]: drop down\n", CB_HWND(lphc));
@@ -1091 +1106 @@
    /* now set popup position */
    GetWindowRect( lphc->hwndself, &rect );
-
 
    /*
@@ -1099 +1113 @@
      rect.left += COMBO_EDITBUTTONSPACE();
 
+   /* if the dropped height is greater than the total height of the dropped
+     items list, then force the drop down list height to be the total height
+     of the items in the dropped list */
+
+   nDroppedHeight = lphc->droppedRect.bottom - lphc->droppedRect.top;
+   nItems = (int)SendMessageA (lphc->hWndLBox, LB_GETCOUNT, 0, 0);
+   nHeight = COMBO_YBORDERGAP;
+   for (i = 0; i < nItems; i++)
+   {
+     nHeight += (int)SendMessageA (lphc->hWndLBox, LB_GETITEMHEIGHT, i, 0);
+
+     if (nHeight >= nDroppedHeight)
+       break;
+   }
+
+   if (nHeight < nDroppedHeight)
+      nDroppedHeight = nHeight;
+
    SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
-                 lphc->droppedRect.right - lphc->droppedRect.left,
-                 lphc->droppedRect.bottom - lphc->droppedRect.top,
-                 SWP_NOACTIVATE | SWP_NOREDRAW);
+                 lphc->droppedRect.right - lphc->droppedRect.left,
+                 nDroppedHeight,
+                 SWP_NOACTIVATE | SWP_NOREDRAW);
+
 
    if( !(lphc->wState & CBF_NOREDRAW) )
@@ -1127 +1160 @@
        //TRACE("[%04x]: roll up [%i]\n", CB_HWND(lphc), (INT)ok );
 
-       /*
-        * It seems useful to send the WM_LBUTTONUP with (-1,-1) when cancelling
-        * and with (0,0) (anywhere in the listbox) when Oking.
-        */
-       SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, ok ? (LPARAM)0 : (LPARAM)(-1) );
-
        if( lphc->wState & CBF_DROPPED )
        {
            RECT rect;
+
+           /*
+            * It seems useful to send the WM_LBUTTONUP with (-1,-1) when cancelling
+            * and with (0,0) (anywhere in the listbox) when Oking.
+            */
+           SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, ok ? (LPARAM)0 : (LPARAM)(-1) );
 
            lphc->wState &= ~CBF_DROPPED;

trunk/src/user32/new/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.2 1999-07-25 16:31:44 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.3 1999-08-15 19:11:00 cbratschi Exp $ */
 /*
  *      Edit control
@@ -17 +17 @@
  */
 
-//#include "config.h"
 #include "winuser.h"
 #include "winbase.h"
 #include <string.h>
-//#include "winnt.h"
-//#include "win.h"
-//#include "wine/winbase16.h"
 #include "controls.h"
 #include "combo.h"
-//#include "local.h"
-//#include "resource.h"
-//#include "debugtools.h"
-//#include "callback.h"
-//#include "tweak.h"
 
 #define BUFLIMIT_MULTI          65534   /* maximum buffer size (not including '\0')
@@ -98 +89 @@
         INT line_count;         /* number of lines */
         INT y_offset;                   /* scroll offset in number of lines */
+        BOOL bCaptureState; /* flag indicating whether mouse was captured */
         /*
          *      only for multi line controls
@@ -3156 +3148 @@
                 return 0;
 
+        es->bCaptureState = TRUE;
         SetCapture(hwnd);
         EDIT_ConfinePoint(hwnd, es, &x, &y);
@@ -3174 +3167 @@
 static LRESULT EDIT_WM_LButtonUp(HWND hwnd, EDITSTATE *es, DWORD keys, INT x, INT y)
 {
-        if (GetCapture() == hwnd) {
-                KillTimer(hwnd, 0);
-                ReleaseCapture();
-        }
-        return 0;
+        if (es->bCaptureState && GetCapture() == hwnd) {
+                KillTimer(hwnd, 0);
+                ReleaseCapture();
+        }
+        es->bCaptureState = FALSE;
+
+        return 0;
 }
 
@@ -3233 +3228 @@
         es->style = cs->style;
 
-        if ((es->style & WS_BORDER) && !(es->style & WS_DLGFRAME))
-                SetWindowLongA(hwnd,GWL_STYLE,GetWindowLongA(hwnd,GWL_STYLE) & ~WS_BORDER);
-
+
+        /*
+         * In Win95 look and feel, the WS_BORDER style is replaced by the
+         * WS_EX_CLIENTEDGE style for the edit control. This gives the edit
+         * control a non client area.
+         */
+        if (es->style & WS_BORDER)
+        {
+          es->style      &= ~WS_BORDER;
+          SetWindowLongA(hwnd,GWL_STYLE,GetWindowLongA(hwnd,GWL_STYLE) & ~WS_BORDER);
+          SetWindowLongA(hwnd,GWL_EXSTYLE,GetWindowLongA(hwnd,GWL_EXSTYLE) | WS_EX_CLIENTEDGE);
+        }
+        
         if (es->style & ES_MULTILINE) {
                 es->buffer_size = BUFSTART_MULTI;
@@ -3316 +3321 @@
                         if(es->style & WS_VSCROLL) rc.right++;
                 }
-                DrawEdge(dc, &rc, EDGE_SUNKEN, BF_RECT);
+                Rectangle(dc, rc.left, rc.top, rc.right, rc.bottom);
         }
         IntersectClipRect(dc, es->format_rect.left,

trunk/src/user32/new/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.2 1999-07-24 17:10:25 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.3 1999-08-15 19:11:01 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -90 +90 @@
     (!IS_OWNERDRAW(descr) || ((descr)->style & LBS_HASSTRINGS))
 
+#define IS_MULTISELECT(descr) \
+    ((descr)->style & LBS_MULTIPLESEL || ((descr)->style & LBS_EXTENDEDSEL))
+
 #define SEND_NOTIFICATION(hwnd,descr,code) \
     (SendMessageA( (descr)->owner, WM_COMMAND, \
@@ -1226 +1229 @@
         if (oldsel != -1) LISTBOX_RepaintItem( hwnd, descr, oldsel, ODA_SELECT);
         if (index != -1) LISTBOX_RepaintItem( hwnd, descr, index, ODA_SELECT );
-        if (send_notify) SEND_NOTIFICATION( hwnd, descr,
+        if (send_notify && descr->nb_items) SEND_NOTIFICATION( hwnd, descr,
                                (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL );
         else
@@ -1273 +1276 @@
     LB_ITEMDATA *item;
     INT max_items;
+    INT oldfocus = descr->focus_item;
 
     if (index == -1) index = descr->nb_items;
@@ -1327 +1331 @@
 
     /* Move selection and focused item */
-
-    if (index <= descr->selected_item) descr->selected_item++;
-    if (index <= descr->focus_item)
-    {
-        descr->focus_item++;
-        LISTBOX_MoveCaret( hwnd, descr, descr->focus_item, FALSE );
-    }
-
     /* If listbox was empty, set focus to the first item */
-
-    if (descr->nb_items == 1) LISTBOX_SetCaretIndex( hwnd, descr, 0, FALSE );
+    if (descr->nb_items == 1)
+         LISTBOX_SetCaretIndex( hwnd, descr, 0, FALSE );
+    /* single select don't change selection index in win31 */
+    else
+    {
+        if (index <= descr->selected_item)
+        {
+           descr->selected_item++;
+           descr->focus_item = oldfocus; /* focus not changed */
+        }
+    }
     return LB_OKAY;
 }
@@ -1364 +1369 @@
     if (HAS_STRINGS(descr))
     {
+        if (!str) str="";
         if (!(new_str = HEAP_strdupA( descr->heap, 0, str )))
         {
@@ -1451 +1457 @@
 
     LISTBOX_UpdateScroll( hwnd, descr );
+    /* if we removed the scrollbar, reset the top of the list
+      (correct for owner-drawn ???) */
+    if (descr->nb_items == descr->page_size)
+        LISTBOX_SetTopItem( hwnd, descr, 0, TRUE );
+
+    /* Move selection and focused item */
+    if (!IS_MULTISELECT(descr))
+    {
+        if (index == descr->selected_item)
+            descr->selected_item = -1;
+        else if (index < descr->selected_item)
+      {
+            descr->selected_item--;
+      }
+    }
     LISTBOX_InvalidateItems( hwnd, descr, index );
-
-    /* Move selection and focused item */
-
-    if (index <= descr->selected_item) descr->selected_item--;
-    if (index <= descr->focus_item)
-    {
-        descr->focus_item--;
-        LISTBOX_MoveCaret( hwnd, descr, descr->focus_item, FALSE );
+    if (descr->focus_item >= descr->nb_items)
+    {
+          descr->focus_item = descr->nb_items - 1;
+          if (descr->focus_item < 0) descr->focus_item = 0;
     }
     return LB_OKAY;
@@ -1781 +1798 @@
         descr->captured = FALSE;
         if (GetCapture() == hwnd) ReleaseCapture();
-        if (descr->style & LBS_NOTIFY)
+        if ((descr->style & LBS_NOTIFY) && descr->nb_items)
             SEND_NOTIFICATION( hwnd, descr, LBN_SELCHANGE );
     }
@@ -1904 +1921 @@
 {
     INT caret = -1;
+    BOOL bForceSelection = TRUE; /* select item pointed to by focus_item */
+
+    if ((IS_MULTISELECT(descr)) || (descr->selected_item == descr->focus_item))
+       bForceSelection = FALSE; /* only for single select list */
+
     if (descr->style & LBS_WANTKEYBOARDINPUT)
     {
@@ -1916 +1938 @@
         if (descr->style & LBS_MULTICOLUMN)
         {
+            bForceSelection = FALSE;
             if (descr->focus_item >= descr->page_size)
                 caret = descr->focus_item - descr->page_size;
@@ -1928 +1951 @@
         if (descr->style & LBS_MULTICOLUMN)
         {
+            bForceSelection = FALSE;
             if (descr->focus_item + descr->page_size < descr->nb_items)
                 caret = descr->focus_item + descr->page_size;
@@ -1971 +1995 @@
                                   (descr->style & LBS_NOTIFY) != 0 );
         }
-        else if (descr->selected_item == -1)
-        {
-            LISTBOX_SetSelection( hwnd, descr, descr->focus_item, TRUE,
-                                  (descr->style & LBS_NOTIFY) != 0 );
-        }
         break;
-    }
+    default:
+        bForceSelection = FALSE;
+    }
+    if (bForceSelection) /* focused item is used instead of key */
+        caret = descr->focus_item;
     if (caret >= 0)
     {
@@ -1984 +2007 @@
             descr->anchor_item = caret;
         LISTBOX_MoveCaret( hwnd, descr, caret, TRUE );
+        LISTBOX_SetSelection( hwnd, descr, caret, TRUE, FALSE);
         if (descr->style & LBS_NOTIFY)
         {
@@ -1991 +2015 @@
                 descr->lphc->wState |= CBF_NOROLLUP;
             }
-            SEND_NOTIFICATION( hwnd, descr, LBN_SELCHANGE );
+            if (descr->nb_items) SEND_NOTIFICATION( hwnd, descr, LBN_SELCHANGE );
         }
     }
@@ -2021 +2045 @@
     if (caret != -1)
     {
+        if ((!IS_MULTISELECT(descr)) && descr->selected_item == -1)
+           LISTBOX_SetSelection( hwnd, descr, caret, TRUE, FALSE);
         LISTBOX_MoveCaret( hwnd, descr, caret, TRUE );
-        if (descr->style & LBS_NOTIFY)
+        if ((descr->style & LBS_NOTIFY) && descr->nb_items)
             SEND_NOTIFICATION( hwnd, descr, LBN_SELCHANGE );
     }
@@ -2135 +2161 @@
     if (!(descr = (LB_DESCR*)GetInfoPtr(hwnd)))
     {
-        if (msg == WM_CREATE)
-        {
-            if (!LISTBOX_Create( hwnd, NULL ))
-                return -1;
-            //TRACE("creating wnd=%04x descr=%p\n",
-            //             hwnd, *(LB_DESCR **)wnd->wExtra );
-            return 0;
-        }
+        switch (msg)
+        {
+            case WM_CREATE:
+            {
+                if (!LISTBOX_Create( hwnd, NULL ))
+                     return -1;
+                //TRACE("creating wnd=%04x descr=%p\n",
+                //      hwnd, *(LB_DESCR **)wnd->wExtra );
+                return 0;
+            }
+            case WM_NCCREATE:
+            {
+                DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+        
+                /*
+                 * When a listbox is not in a combobox and the look
+                 * is win95,  the WS_BORDER style is replaced with
+                 * the WS_EX_CLIENTEDGE style.
+                 */
+                if (dwStyle & WS_BORDER)
+                {
+                    SetWindowLongA(hwnd,GWL_EXSTYLE,GetWindowLongA(hwnd,GWL_EXSTYLE) | WS_EX_CLIENTEDGE);
+                    SetWindowLongA(hwnd,GWL_STYLE,GetWindowLongA(hwnd,GWL_STYLE)  & ~ WS_BORDER);
+                }
+            }
+        }
         /* Ignore all other messages before we get a WM_CREATE */
         return DefWindowProcA( hwnd, msg, wParam, lParam );
@@ -2167 +2211 @@
 
     case LB_DELETESTRING:
-        return LISTBOX_RemoveItem( hwnd, descr, wParam );
+        if (LISTBOX_RemoveItem( hwnd, descr, wParam) != LB_ERR)
+           return descr->nb_items;
+        else
+           return LB_ERR;       
 
     case LB_GETITEMDATA:
@@ -2195 +2242 @@
         if (descr->nb_items==0)
           return LB_ERR;
+        if (!IS_MULTISELECT(descr))
+          return descr->selected_item;
         /* else */
         if (descr->selected_item!=-1)
@@ -2228 +2277 @@
 
     case LB_SETCARETINDEX:
-        return LISTBOX_SetCaretIndex( hwnd, descr, wParam, !lParam );
+        if ((!IS_MULTISELECT(descr)) && (descr->selected_item != -1)) return LB_ERR;
+        if (LISTBOX_SetCaretIndex( hwnd, descr, wParam, !lParam ) == LB_ERR)
+            return LB_ERR;
+        else
+             return LB_OKAY;
 
     case LB_GETCARETINDEX:
@@ -2267 +2320 @@
 
     case LB_SETCURSEL:
+        if (IS_MULTISELECT(descr)) return LB_ERR;
         LISTBOX_SetCaretIndex( hwnd, descr, wParam, TRUE );
         return LISTBOX_SetSelection( hwnd, descr, wParam, TRUE, FALSE );
@@ -2436 +2490 @@
         break;
 
-    case WM_NCCREATE:
-        SetWindowLongA(hwnd,GWL_EXSTYLE,GetWindowLongA(hwnd,GWL_EXSTYLE) | WS_EX_CLIENTEDGE);
-        return DefWindowProcA( hwnd, msg, wParam, lParam );
     default:
         //if ((msg >= WM_USER) && (msg < 0xc000))

trunk/src/user32/new/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.4 1999-07-24 17:10:25 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.5 1999-08-15 19:11:01 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -52 +52 @@
 
   /* Overlap between arrows and thumb */
-#define SCROLL_ARROW_THUMB_OVERLAP 1
+#define SCROLL_ARROW_THUMB_OVERLAP 0
 
   /* Delay (in ms) before first repetition when holding the button down */
@@ -97 +97 @@
 static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
                                    const SCROLLINFO *info, INT *action );
+static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar,
+                                    RECT *rect, INT arrowSize,
+                                    INT thumbSize, INT thumbPos,
+                                    UINT flags, BOOL vertical,
+                                    BOOL top_selected, BOOL bottom_selected );
 
 /***********************************************************************
@@ -379 +384 @@
 }
 
-
 /***********************************************************************
  *           SCROLL_DrawArrows
@@ -385 +389 @@
  * Draw the scroll bar arrows.
  */
+static void SCROLL_DrawArrows_9x( HDC hdc, SCROLLBAR_INFO *infoPtr,
+                                  RECT *rect, INT arrowSize, BOOL vertical,
+                                  BOOL top_pressed, BOOL bottom_pressed )
+{
+  RECT r;
+
+  r = *rect;
+  if( vertical )
+    r.bottom = r.top + arrowSize;
+  else
+    r.right = r.left + arrowSize;
+
+  DrawFrameControl( hdc, &r, DFC_SCROLL,
+                    (vertical ? DFCS_SCROLLUP : DFCS_SCROLLLEFT)
+                    | (top_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0 )
+                    | (infoPtr->flags&ESB_DISABLE_LTUP ? DFCS_INACTIVE : 0 ) );
+
+  r = *rect;
+  if( vertical )
+    r.top = r.bottom-arrowSize;
+  else
+    r.left = r.right-arrowSize;
+
+  DrawFrameControl( hdc, &r, DFC_SCROLL,
+                    (vertical ? DFCS_SCROLLDOWN : DFCS_SCROLLRIGHT)
+                    | (bottom_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0 )
+                    | (infoPtr->flags&ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) );
+}
+
 static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr,
-                               RECT *rect, INT arrowSize, BOOL vertical,
-                               BOOL top_pressed, BOOL bottom_pressed )
-{
-    HDC hdcMem = CreateCompatibleDC( hdc );
-    HBITMAP hbmpPrev = SelectObject( hdcMem, vertical ?
-                                    TOP_ARROW(infoPtr->flags, top_pressed)
-                                    : LEFT_ARROW(infoPtr->flags, top_pressed));
-    INT offset = 1;
-
-    if (offset) arrowSize--;
-    SetStretchBltMode( hdc, STRETCH_DELETESCANS );
-    StretchBlt( hdc, rect->left+offset, rect->top+offset,
-                  vertical ? rect->right-(rect->left+offset) : arrowSize,
-                  vertical ? arrowSize : rect->bottom-(rect->top+offset),
-                  hdcMem, 0, 0,
-                  GetSystemMetrics(SM_CXVSCROLL),GetSystemMetrics(SM_CYHSCROLL),
-                  SRCCOPY );
-
-    SelectObject( hdcMem, vertical ?
-                    BOTTOM_ARROW( infoPtr->flags, bottom_pressed )
-                    : RIGHT_ARROW( infoPtr->flags, bottom_pressed ) );
-    if (vertical)
-        StretchBlt( hdc, (rect->left+offset), rect->bottom - arrowSize,
-                      rect->right - (rect->left+offset), arrowSize,
-                      hdcMem, 0, 0,
-                      GetSystemMetrics(SM_CXVSCROLL),GetSystemMetrics(SM_CYHSCROLL),
-                      SRCCOPY );
-    else
-        StretchBlt( hdc, rect->right - arrowSize, rect->top+offset,
-                      arrowSize, rect->bottom - (rect->top+offset),
-                      hdcMem, 0, 0,
-                      GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL),
-                      SRCCOPY );
-    SelectObject( hdcMem, hbmpPrev );
-    DeleteDC( hdcMem );
+                               RECT *rect, INT arrowSize, BOOL vertical,
+                               BOOL top_pressed, BOOL bottom_pressed )
+{
+  SCROLL_DrawArrows_9x( hdc, infoPtr, rect, arrowSize,
+                        vertical, top_pressed,bottom_pressed );
 }
 
@@ -429 +432 @@
  * Draw the moving thumb rectangle.
  */
+static void SCROLL_DrawMovingThumb_9x( HDC hdc, RECT *rect, BOOL vertical,
+                                       INT arrowSize, INT thumbSize )
+{
+  INT pos = SCROLL_TrackingPos;
+  INT max_size;
+
+  if( vertical )
+    max_size = rect->bottom - rect->top;
+  else
+    max_size = rect->right - rect->left;
+
+  max_size -= (arrowSize-SCROLL_ARROW_THUMB_OVERLAP) + thumbSize;
+
+  if( pos < (arrowSize-SCROLL_ARROW_THUMB_OVERLAP) )
+    pos = (arrowSize-SCROLL_ARROW_THUMB_OVERLAP);
+  else if( pos > max_size )
+    pos = max_size;
+
+  SCROLL_DrawInterior_9x( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar,
+                          rect, arrowSize, thumbSize, pos,
+                          0, vertical, FALSE, FALSE );
+                        
+  SCROLL_MovingThumb = !SCROLL_MovingThumb;
+}
+
 static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical,
-                                    INT arrowSize, INT thumbSize )
-{
-    RECT r = *rect;
-    if (vertical)
-    {
-        r.top += SCROLL_TrackingPos;
-        if (r.top < rect->top + arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
-            r.top = rect->top + arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
-        if (r.top + thumbSize >
-                       rect->bottom - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP))
-            r.top = rect->bottom - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
-                                                                  - thumbSize;
-        r.bottom = r.top + thumbSize;
-    }
-    else
-    {
-        r.left += SCROLL_TrackingPos;
-        if (r.left < rect->left + arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
-            r.left = rect->left + arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
-        if (r.left + thumbSize >
-                       rect->right - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP))
-            r.left = rect->right - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
-                                                                  - thumbSize;
-        r.right = r.left + thumbSize;
-    }
-    DrawFocusRect( hdc, &r );
-    SCROLL_MovingThumb = !SCROLL_MovingThumb;
-}
-
+                                    INT arrowSize, INT thumbSize )
+{
+  SCROLL_DrawMovingThumb_9x( hdc, rect, vertical, arrowSize, thumbSize );
+}
 
 /***********************************************************************
@@ -465 +468 @@
  * Draw the scroll bar interior (everything except the arrows).
  */
+static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar,
+                                    RECT *rect, INT arrowSize,
+                                    INT thumbSize, INT thumbPos,
+                                    UINT flags, BOOL vertical,
+                                    BOOL top_selected, BOOL bottom_selected )
+{
+    RECT r;
+    HPEN hSavePen;
+    HBRUSH hSaveBrush,hBrush;
+
+    /* Only scrollbar controls send WM_CTLCOLORSCROLLBAR.
+     * The window-owned scrollbars need to call DEFWND_ControlColor
+     * to correctly setup default scrollbar colors
+     */
+    if (nBar == SB_CTL)
+    {
+      hBrush = (HBRUSH)SendMessageA( GetParent(hwnd), WM_CTLCOLORSCROLLBAR,
+                                     (WPARAM)hdc,(LPARAM)hwnd);
+    }
+    else
+    {
+      //CB: implement!
+      //hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR );
+    }
+
+    hSavePen = SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
+    hSaveBrush = SelectObject( hdc, hBrush );
+
+    /* Calculate the scroll rectangle */
+    r = *rect;
+    if (vertical)
+    {
+        r.top    += arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
+        r.bottom -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
+    }
+    else
+    {
+        r.left  += arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
+        r.right -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
+    }
+
+    /* Draw the scroll rectangles and thumb */
+    if (!thumbPos)  /* No thumb to draw */
+    {
+        PatBlt( hdc, r.left, r.top,
+                     r.right - r.left, r.bottom - r.top,
+                     PATCOPY );
+
+        /* cleanup and return */
+        SelectObject( hdc, hSavePen );
+        SelectObject( hdc, hSaveBrush );
+        return;
+    }
+
+    if (vertical)
+    {
+        PatBlt( hdc, r.left, r.top,
+                  r.right - r.left,
+                  thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP),
+                  top_selected ? 0x0f0000 : PATCOPY );
+        r.top += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
+        PatBlt( hdc, r.left, r.top + thumbSize,
+                  r.right - r.left,
+                  r.bottom - r.top - thumbSize,
+                  bottom_selected ? 0x0f0000 : PATCOPY );
+        r.bottom = r.top + thumbSize;
+    }
+    else  /* horizontal */
+    {
+        PatBlt( hdc, r.left, r.top,
+                  thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP),
+                  r.bottom - r.top,
+                  top_selected ? 0x0f0000 : PATCOPY );
+        r.left += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
+        PatBlt( hdc, r.left + thumbSize, r.top,
+                  r.right - r.left - thumbSize,
+                  r.bottom - r.top,
+                  bottom_selected ? 0x0f0000 : PATCOPY );
+        r.right = r.left + thumbSize;
+    }
+
+    /* Draw the thumb */
+    DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT | BF_MIDDLE  );
+
+    /* cleanup */
+    SelectObject( hdc, hSavePen );
+    SelectObject( hdc, hSaveBrush );
+}
+
+
 static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar,
                                  RECT *rect, INT arrowSize,
@@ -483 +576 @@
       /* Select the correct brush and pen */
 
-    if ((flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)
-    {
-        /* This ought to be the color of the parent window */
-        //hBrush = GetSysColorBrush(COLOR_WINDOW);
-        /* Under Win9x look & feel, scrollbars don't have a solid border.
-         * To make scrollbar's background different from the window
-         * background, we need to apply a gray 0x55aa pattern brush.
-         * Otherwise it won't look good.
-         */
-         //hBrush = CACHE_GetPattern55AABrush();
-         hBrush = GetSysColorBrush(COLOR_3DFACE); //CB: improve!
-    }
-    else
-    {
-        /* Only scrollbar controls send WM_CTLCOLORSCROLLBAR.
-         * The window-owned scrollbars need to call DEFWND_ControlColor
-         * to correctly setup default scrollbar colors
-         */
-        if (nBar == SB_CTL) {
-            hBrush = (HBRUSH)SendMessageA( GetParent(hwnd), WM_CTLCOLORSCROLLBAR,
-                                           (WPARAM)hdc,(LPARAM)hwnd);
-        } else {
-/* CB: implement later!
-            hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR );
-*/
-        }
-    }
+    /* Only scrollbar controls send WM_CTLCOLORSCROLLBAR.
+     * The window-owned scrollbars need to call DEFWND_ControlColor
+     * to correctly setup default scrollbar colors
+     */
+    if (nBar == SB_CTL) {
+        hBrush = (HBRUSH)SendMessageA( GetParent(hwnd), WM_CTLCOLORSCROLLBAR,
+                                       (WPARAM)hdc,(LPARAM)hwnd);
+    } else {
+        //CB: implement!
+        //hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR );
+    }
+
     hSavePen = SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
     hSaveBrush = SelectObject( hdc, hBrush );
@@ -527 +605 @@
     }
 
+      /* Draw the scroll bar frame */
+
+        /* Only draw outline if Win 3.1.  Mar 24, 1999 - Ronald B. Cemer */
+
       /* Draw the scroll rectangles and thumb */
 
     if (!thumbPos)  /* No thumb to draw */
     {
-        PatBlt( hdc, r.left+1, r.top+1, r.right - r.left - 2,
-                  r.bottom - r.top - 2, PATCOPY );
+        INT offset = 0;
+
+        PatBlt( hdc, r.left+offset, r.top+offset,
+                     r.right - r.left - 2*offset, r.bottom - r.top - 2*offset,
+                     PATCOPY );
 
         /* cleanup and return */
@@ -542 +627 @@
     if (vertical)
     {
-        PatBlt( hdc, r.left + 1, r.top + 1,
-                  r.right - r.left - 2,
-                  thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) - 1,
+        INT offset = 0;
+
+        PatBlt( hdc, r.left + offset, r.top + offset,
+                  r.right - r.left - offset*2,
+                  thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) - offset,
                   top_selected ? 0x0f0000 : PATCOPY );
         r.top += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
-        PatBlt( hdc, r.left + 1, r.top + thumbSize,
-                  r.right - r.left - 2,
-                  r.bottom - r.top - thumbSize - 1,
+        PatBlt( hdc, r.left + offset, r.top + thumbSize,
+                  r.right - r.left - offset*2,
+                  r.bottom - r.top - thumbSize - offset,
                   bottom_selected ? 0x0f0000 : PATCOPY );
         r.bottom = r.top + thumbSize;
@@ -555 +642 @@
     else  /* horizontal */
     {
-        PatBlt( hdc, r.left + 1, r.top + 1,
-                  thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) - 1,
-                  r.bottom - r.top - 2,
+        INT offset = 0;
+
+        PatBlt( hdc, r.left + offset, r.top + offset,
+                  thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP),
+                  r.bottom - r.top - offset*2,
                   top_selected ? 0x0f0000 : PATCOPY );
         r.left += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
-        PatBlt( hdc, r.left + thumbSize, r.top + 1,
-                  r.right - r.left - thumbSize - 1,
-                  r.bottom - r.top - 2,
+        PatBlt( hdc, r.left + thumbSize, r.top + offset,
+                  r.right - r.left - thumbSize - offset,
+                  r.bottom - r.top - offset*2,
                   bottom_selected ? 0x0f0000 : PATCOPY );
         r.right = r.left + thumbSize;
@@ -571 +660 @@
     SelectObject( hdc, GetSysColorBrush(COLOR_BTNFACE) );
 
-    r.top++, r.left++;
-    r.bottom--; r.right--;
-    Rectangle( hdc, r.left, r.top, r.right-1, r.bottom-1 );
+    Rectangle( hdc, r.left+1, r.top+1, r.right-1, r.bottom-1 );
 
     DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT );
@@ -586 +673 @@
     SelectObject( hdc, hSaveBrush );
 }
-
 
 /***********************************************************************
@@ -770 +856 @@
                 SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_LINEUP, hwndCtl );
-                //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
-                //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                //                  (TIMERPROC)0 );
             }
+            //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+            //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+            //                  (TIMERPROC)0 );
         }
         //CB: else KillSystemTimer( hwnd, SCROLL_TIMER );
@@ -871 +957 @@
                 SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_LINEDOWN, hwndCtl );
-                //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
-                //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                //                  (TIMERPROC)0 );
             }
+            //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+            //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+            //                  (TIMERPROC)0 );
         }
         //CB: else KillSystemTimer( hwnd, SCROLL_TIMER );

trunk/src/user32/new/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.4 1999-07-24 17:10:26 cbratschi Exp $ */
+/* $Id: static.cpp,v 1.5 1999-08-15 19:11:01 cbratschi Exp $ */
 /*
  * Static control
@@ -83 +83 @@
  * Set the bitmap for an SS_BITMAP control.
  */
-static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hbitmap )
-{
-    HBITMAP prevIcon;
+static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap )
+{
+    HBITMAP hOldBitmap;
     STATICINFO *infoPtr = (STATICINFO *)GetInfoPtr(hwnd);
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
@@ -91 +91 @@
     if ((dwStyle & SS_TYPEMASK) != SS_BITMAP) return 0;
 
-    if (infoPtr->hIcon) DeleteObject(infoPtr->hIcon);
-    prevIcon = infoPtr->hIcon;
-    infoPtr->hIcon = hbitmap;
-
-    if (hbitmap)
+    if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) {
+        //ERR("huh? hBitmap!=0, but not bitmap\n");
+        return 0;
+    }
+    hOldBitmap = infoPtr->hIcon;
+    infoPtr->hIcon = hBitmap;
+    if (hBitmap)
     {
+        BITMAP bm;
+        GetObjectA(hBitmap, sizeof(bm), &bm);
+        SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight,
+                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
+/* CB: alternative code, if necessary
       HDC hdc = GetDC(hwnd);
       BITMAPINFO info;
@@ -106 +113 @@
       }
       ReleaseDC(hwnd,hdc);
-    }
-
-    return prevIcon;
-}
-
+*/                      
+                
+    }
+    return hOldBitmap;
+}
 
 /***********************************************************************
@@ -535 +542 @@
                              hdc, hwnd );
     FillRect( hdc, &rc, hbrush );
-    if (infoPtr->hIcon)
-      DrawIcon(hdc,0,0,infoPtr->hIcon);
+
+    if (infoPtr->hIcon) {
+        BITMAP bm;
+        SIZE sz;
+
+        if(GetObjectType(infoPtr->hIcon) != OBJ_BITMAP)
+            return;
+        if (!(hMemDC = CreateCompatibleDC( hdc ))) return;
+        GetObjectA(infoPtr->hIcon, sizeof(bm), &bm);
+        GetBitmapDimensionEx(infoPtr->hIcon, &sz);
+        oldbitmap = SelectObject(hMemDC, infoPtr->hIcon);
+        BitBlt(hdc, sz.cx, sz.cy, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0,
+               SRCCOPY);
+        SelectObject(hMemDC, oldbitmap);
+        DeleteDC(hMemDC);
+    }
 }
 

trunk/src/user32/new/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.2 1999-08-03 21:22:34 sandervl Exp $ */
+/* $Id: uitools.cpp,v 1.3 1999-08-15 19:11:02 cbratschi Exp $ */
 /*
  * User Interface Functions
@@ -462 +462 @@
         LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)];
         LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)];
+
+        /* Bertho Stultiens states above that this function exactly matches win95
+         * In win98 BF_FLAT rectangels have an inner border same color as the
+         * middle (COLOR_BTNFACE). I believe it's the same for win95 but since
+         * I don't know I go with Bertho and just sets it for win98 until proven
+         * otherwise.
+         *                                          Dennis Björklund, 10 June, 99
+         */
+        if(LTInnerI != -1 )     
+            LTInnerI = RBInnerI = COLOR_BTNFACE;
     }
     else if(uFlags & BF_SOFT)
@@ -488 +498 @@
     if(RBOuterI != -1) RBOuterPen = GetSysColorPen(RBOuterI);
 
-    if((uFlags & BF_MIDDLE) && retval)
-    {
-        FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ?
-                                            COLOR_WINDOW : COLOR_BTNFACE));
-    }
-
     MoveToEx(hdc, 0, 0, &SavePoint);
 
@@ -545 +549 @@
     }
 
-    /* Adjust rectangle if asked */
-    if(uFlags & BF_ADJUST)
+    if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) )
     {
         int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0)
                 + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0);
-        if(uFlags & BF_LEFT)   rc->left   += add;
-        if(uFlags & BF_RIGHT)  rc->right  -= add;
-        if(uFlags & BF_TOP)    rc->top    += add;
-        if(uFlags & BF_BOTTOM) rc->bottom -= add;
+
+        if(uFlags & BF_LEFT)   InnerRect.left   += add;
+        if(uFlags & BF_RIGHT)  InnerRect.right  -= add;
+        if(uFlags & BF_TOP)    InnerRect.top    += add;
+        if(uFlags & BF_BOTTOM) InnerRect.bottom -= add;
+
+        if((uFlags & BF_MIDDLE) && retval)
+        {
+            FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ?
+                                                       COLOR_WINDOW : COLOR_BTNFACE));
+        }
+
+        if(uFlags & BF_ADJUST)
+            *rc = InnerRect;
     }
 
@@ -1124 +1137 @@
     HBRUSH hbsave, hb, hb2;
     HPEN hpsave, hp, hp2;
-    int tri = 310*SmallDiam/1000;
+    int tri = 290*SmallDiam/1000 -1;
     int d46, d93;
 
@@ -1140 +1153 @@
     case DFCS_SCROLLUP:
         Line[2].x = myr.left + 470*SmallDiam/1000 + 2;
-        Line[2].y = myr.top  + 313*SmallDiam/1000 + 1;
+        Line[2].y = myr.bottom - 687*SmallDiam/1000 + 1;
         Line[0].x = Line[2].x - tri;
         Line[1].x = Line[2].x + tri;
@@ -1147 +1160 @@
 
     case DFCS_SCROLLLEFT:
-        Line[2].x = myr.left + 313*SmallDiam/1000 + 1;
+        Line[2].x = myr.right - 687*SmallDiam/1000 + 1;
         Line[2].y = myr.top  + 470*SmallDiam/1000 + 2;
         Line[0].y = Line[2].y - tri;
@@ -1242 +1255 @@
 
     /* Here do the real scroll-bar controls end up */
-    UITOOLS95_DFC_ButtonPush(dc, r, uFlags & 0xff00);
+    if( ! (uFlags & (0xff00 & ~DFCS_ADJUSTRECT)) )
+      /* UITOOLS95_DFC_ButtonPush always uses BF_SOFT which we don't */
+      /* want for the normal scroll-arrow button. */
+      UITOOLS95_DrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT);
+    else
+      UITOOLS95_DFC_ButtonPush(dc, r, (uFlags & 0xff00) );
 
     if(uFlags & DFCS_INACTIVE)
@@ -1253 +1271 @@
     }
 
-    for(i = 0; i < 3; i++)
-    {
+    if( (uFlags & DFCS_INACTIVE) || !(uFlags & DFCS_PUSHED) )
+      for(i = 0; i < 3; i++)
+      {
         Line[i].x--;
         Line[i].y--;
-    }
+      }
 
     i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT;