Changeset 2852 for trunk/src/user32/listbox.cpp

Timestamp:

Feb 21, 2000, 6:25:33 PM (26 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000212, added WS_EX_CONTEXTHELP

File:

• trunk/src/user32/listbox.cpp (modified) (31 diffs)

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.19 2000-02-16 14:34:20 sandervl Exp $ */
+/* $Id: listbox.cpp,v 1.20 2000-02-21 17:25:27 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -6 +6 @@
  * Copyright 1999 Christoph Bratschi (ported from WINE)
  *
+ * Corel version: 20000212
  * WINE version: 991212
  */
@@ -18 +19 @@
 #include <misc.h>
 
-#define DBG_LOCALLOG    DBG_listbox
+#define DBG_LOCALLOG    DBG_listbox
 #include "dbglocal.h"
 
@@ -81 +82 @@
     BOOL        caret_on;       /* Is caret on? */
     BOOL        captured;       /* Is mouse captured? */
+    BOOL        in_focus;
     HFONT       font;           /* Current font */
     LCID          locale;         /* Current locale for string comparisons */
@@ -172 +174 @@
     SCROLLINFO info;
 
-    if (!(descr->style & WS_VSCROLL)) return;
+    /* Check the listbox scroll bar flags individually before we call
+       SetScrollInfo otherwise when the listbox style is WS_HSCROLL and
+       no WS_VSCROLL, we end up with an uninitialized, visible horizontal
+       scroll bar when we do not need one.
+              if (!(descr->style & WS_VSCROLL)) return;
+          */
+
     /*   It is important that we check descr->style, and not wnd->dwStyle,
        for WS_VSCROLL, as the former is exactly the one passed in
@@ -194 +202 @@
         if (descr->style & LBS_DISABLENOSCROLL)
             info.fMask |= SIF_DISABLENOSCROLL;
-        SetScrollInfo( hwnd, SB_HORZ, &info, TRUE );
+        if (descr->style & WS_HSCROLL)
+          SetScrollInfo( hwnd, SB_HORZ, &info, TRUE );
         info.nMax = 0;
         info.fMask = SIF_RANGE;
-        SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
+        if (descr->style & WS_VSCROLL)
+          SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
     }
     else
@@ -208 +218 @@
         if (descr->style & LBS_DISABLENOSCROLL)
             info.fMask |= SIF_DISABLENOSCROLL;
-
-        SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
+        if (descr->style & WS_VSCROLL)
+          SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
 
         if (descr->horz_extent)
@@ -220 +230 @@
             if (descr->style & LBS_DISABLENOSCROLL)
                 info.fMask |= SIF_DISABLENOSCROLL;
-            SetScrollInfo( hwnd, SB_HORZ, &info, TRUE );
+            if (descr->style & WS_HSCROLL)
+              SetScrollInfo( hwnd, SB_HORZ, &info, TRUE );
         }
     }
@@ -314 +325 @@
 
     GetWindowRect( hwnd, &rectWindow );
-    OffsetRect(&rectWindow, -rectWindow.left, -rectWindow.top);
     GetClientRect( hwnd, &rect );
 
+    //CB: todo: doesn't works in ShellAbout dialog
     descr->width  = rect.right - rect.left;
     descr->height = rect.bottom - rect.top;
@@ -479 +490 @@
         if ((descr->focus_item == index) &&
             (descr->caret_on) &&
-            (GetFocus() == hwnd)) dis.itemState |= ODS_FOCUS;
+            (descr->in_focus)) dis.itemState |= ODS_FOCUS;
         if (dwStyle & WS_DISABLED) dis.itemState |= ODS_DISABLED;
         dis.itemData     = item ? item->data : 0;
@@ -532 +543 @@
         if ((descr->focus_item == index) &&
             (descr->caret_on) &&
-            (GetFocus() == hwnd)) DrawFocusRect( hdc, rect );
+            (descr->in_focus)) DrawFocusRect( hdc, rect );
     }
 }
@@ -878 +889 @@
 
     if (!descr->nb_items && (descr->focus_item != -1) && descr->caret_on &&
-        (GetFocus() == hwnd))
+        (descr->in_focus))
     {
         /* Special case for empty listbox: paint focus rect */
@@ -1071 +1082 @@
 static LRESULT LISTBOX_SetColumnWidth( HWND hwnd, LB_DESCR *descr, UINT width)
 {
-    width += 2;  /* For left and right margin */
     if (width == descr->column_width) return LB_OKAY;
     //TRACE("[%04x]: new column width = %d\n",
@@ -1203 +1213 @@
     if (index == oldfocus) return LB_OKAY;
     descr->focus_item = index;
-    if ((oldfocus != -1) && descr->caret_on && (GetFocus() == hwnd))
+    if ((oldfocus != -1) && descr->caret_on && (descr->in_focus))
         LISTBOX_RepaintItem( hwnd, descr, oldfocus, ODA_FOCUS );
 
     LISTBOX_MakeItemVisible( hwnd, descr, index, fully_visible );
-    if (descr->caret_on && (GetFocus() == hwnd))
+    if (descr->caret_on && (descr->in_focus))
         LISTBOX_RepaintItem( hwnd, descr, index, ODA_FOCUS );
 
@@ -1235 +1245 @@
         if (index != -1) descr->items[index].selected = TRUE;
         descr->selected_item = index;
-        if (oldsel != -1) LISTBOX_RepaintItem( hwnd, descr, oldsel, 0);
+        if (oldsel != -1) LISTBOX_RepaintItem( hwnd, descr, oldsel, ODA_SELECT);
         if (index != -1) LISTBOX_RepaintItem( hwnd, descr, index, ODA_SELECT );
         if (send_notify && descr->nb_items) SEND_NOTIFICATION( hwnd, descr,
@@ -1440 +1450 @@
     if (index == -1) index = descr->nb_items - 1;
     else if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
+
+    /* We need to Invalidate the original rect intead of the updated one. */
+    LISTBOX_InvalidateItems( hwnd, descr, index );
+
     LISTBOX_DeleteItem( hwnd, descr, index );
 
@@ -1480 +1494 @@
       }
     }
-    LISTBOX_InvalidateItems( hwnd, descr, index );
+
     if (descr->focus_item >= descr->nb_items)
     {
@@ -1733 +1747 @@
 }
 
+static LRESULT LISTBOX_HandleMouseWheel(HWND hwnd, LB_DESCR *descr,WPARAM wParam, LPARAM lParam )
+{
+    short gcWheelDelta = 0;
+    UINT pulScrollLines = 3;
+
+    SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0);
+
+    gcWheelDelta -= (short) HIWORD(wParam);
+
+    if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines)
+    {
+        int cLineScroll = (int) min((UINT) descr->page_size, pulScrollLines);
+        cLineScroll *= (gcWheelDelta / WHEEL_DELTA);
+        LISTBOX_SetTopItem( hwnd, descr, descr->top_item + cLineScroll, TRUE );
+    }
+    return 0;
+}
 
 /***********************************************************************
@@ -1743 +1774 @@
     //TRACE("[%04x]: lbuttondown %d,%d item %d\n",
     //             wnd->hwndSelf, x, y, index );
-    if (!descr->caret_on && (GetFocus() == hwnd)) return 0;
+    if (!descr->caret_on && (descr->in_focus)) return 0;
     if (index != -1)
     {
@@ -1768 +1799 @@
     }
 
-    if( !descr->lphc ) SetFocus( hwnd );
-    else SetFocus( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit
+    if (!descr->in_focus)
+    {
+      if( !descr->lphc ) SetFocus( hwnd );
+      else SetFocus( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit
                                              : descr->lphc->hwndself ) ;
+    }
 
     descr->captured = TRUE;
@@ -2191 +2225 @@
     descr->tabs          = NULL;
     descr->caret_on      = TRUE;
+    descr->in_focus      = FALSE;
     descr->captured      = FALSE;
     descr->font          = 0;
@@ -2483 +2518 @@
             return LB_OKAY;
         descr->caret_on = TRUE;
-        if ((descr->focus_item != -1) && (GetFocus() == hwnd))
+        if ((descr->focus_item != -1) && (descr->in_focus))
             LISTBOX_RepaintItem( hwnd, descr, descr->focus_item, ODA_FOCUS );
         return LB_OKAY;
@@ -2491 +2526 @@
             return LB_OKAY;
         descr->caret_on = FALSE;
-        if ((descr->focus_item != -1) && (GetFocus() == hwnd))
+        if ((descr->focus_item != -1) && (descr->in_focus))
             LISTBOX_RepaintItem( hwnd, descr, descr->focus_item, ODA_FOCUS );
         return LB_OKAY;
@@ -2528 +2563 @@
         return 0;
     case WM_SETFOCUS:
+        descr->in_focus = TRUE;
         descr->caret_on = TRUE;
         if (descr->focus_item != -1)
@@ -2534 +2570 @@
         return 0;
     case WM_KILLFOCUS:
+        descr->in_focus = FALSE;
         if ((descr->focus_item != -1) && descr->caret_on)
             LISTBOX_RepaintItem( hwnd, descr, descr->focus_item, ODA_FOCUS );
@@ -2542 +2579 @@
     case WM_VSCROLL:
         return LISTBOX_HandleVScroll( hwnd, descr, wParam, lParam );
+    case WM_MOUSEACTIVATE:
+        return MA_NOACTIVATE;
+    case WM_MOUSEWHEEL:
+        if (wParam & (MK_SHIFT | MK_CONTROL))
+            return DefWindowProcA( hwnd, msg, wParam, lParam );
+        return LISTBOX_HandleMouseWheel( hwnd, descr, wParam, lParam );
     case WM_LBUTTONDOWN:
         return LISTBOX_HandleLButtonDown( hwnd, descr, wParam,
@@ -2650 +2693 @@
                  return LISTBOX_Create( hwnd, lphc );
             case WM_MOUSEMOVE:
-                 if (CB_GETTYPE(lphc) != CBS_SIMPLE)
+                 if (lphc && (CB_GETTYPE(lphc) != CBS_SIMPLE))
                  {
                    POINT   mousePos;
@@ -2691 +2734 @@
                  }
             case WM_LBUTTONUP:
+            if (lphc)
+            {
                  POINT mousePos;
                  RECT  clientRect;
@@ -2719 +2764 @@
                  }
                  return LISTBOX_HandleLButtonUp( hwnd, descr );
+            }
             case WM_LBUTTONDOWN:
                  return LISTBOX_HandleLButtonDownCombo( hwnd, descr, wParam,
@@ -2727 +2773 @@
                  return FALSE;
             case WM_KEYDOWN:
-                 if( CB_GETTYPE(lphc) != CBS_SIMPLE )
+                 if(lphc && (CB_GETTYPE(lphc) != CBS_SIMPLE))
                  {
                      /* for some reason(?) Windows makes it possible to
@@ -2746 +2792 @@
                  return lRet;
             case WM_NCDESTROY:
-                 if( CB_GETTYPE(lphc) != CBS_SIMPLE )
+                 if(lphc && (CB_GETTYPE(lphc) != CBS_SIMPLE))
                      lphc->hWndLBox = 0;
                  /* fall through */