commit c72a9aa83e8297abafef294c810ac2d06a44e768
author Alexandre Julliard <julliard@winehq.org> Thu Jan 31 21:05:05 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 31 21:05:05 2002 +0000
tree b974a1da259f97a83038b1c61e1d4a60e3f181ca
parent bde5cf0bc23acaa06831e8100ff104ccd608bdef

CodeWeavers
Minor fixes.

controls/listbox.c

diff --git a/controls/listbox.c b/controls/listbox.c
index 042f131..65de3f1 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -1136,7 +1136,7 @@
  *           LISTBOX_SetItemHeight
  */
 static LRESULT LISTBOX_SetItemHeight( HWND hwnd, LB_DESCR *descr, INT index,
-                                      INT height )
+                                      INT height, BOOL repaint )
 {
     if (!height) height = 1;
 
@@ -1146,7 +1146,8 @@
         TRACE("[%04x]: item %d height = %d\n", hwnd, index, height );
         descr->items[index].height = height;
         LISTBOX_UpdateScroll( hwnd, descr );
-        LISTBOX_InvalidateItems( hwnd, descr, index );
+	if (repaint)
+	    LISTBOX_InvalidateItems( hwnd, descr, index );
     }
     else if (height != descr->item_height)
     {
@@ -1154,7 +1155,8 @@
         descr->item_height = height;
         LISTBOX_UpdatePage( hwnd, descr );
         LISTBOX_UpdateScroll( hwnd, descr );
-        InvalidateRect( hwnd, 0, TRUE );
+	if (repaint)
+	    InvalidateRect( hwnd, 0, TRUE );
     }
     return LB_OKAY;
 }
@@ -1238,7 +1240,7 @@
     if (oldFont) SelectObject( hdc, oldFont );
     ReleaseDC( hwnd, hdc );
     if (!IS_OWNERDRAW(descr))
-        LISTBOX_SetItemHeight( hwnd, descr, 0, tm.tmHeight );
+        LISTBOX_SetItemHeight( hwnd, descr, 0, tm.tmHeight, FALSE );
     return tm.tmHeight ;
 }
 
@@ -2620,7 +2622,7 @@
         lParam = LOWORD(lParam);
         /* fall through */
     case LB_SETITEMHEIGHT:
-        return LISTBOX_SetItemHeight( hwnd, descr, wParam, lParam );
+        return LISTBOX_SetItemHeight( hwnd, descr, wParam, lParam, TRUE );
 
     case LB_ITEMFROMPOINT:
         {

controls/scroll.c

diff --git a/controls/scroll.c b/controls/scroll.c
index 6f83cd3..9190eb6 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -1172,7 +1172,16 @@
     {
     case WM_CREATE:
         {
+	    SCROLLBAR_INFO *infoPtr;
             CREATESTRUCTW *lpCreat = (CREATESTRUCTW *)lParam;
+
+	    if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, SB_CTL ))) return -1;
+	    if (lpCreat->style & WS_DISABLED)
+	    {
+		TRACE("Created WS_DISABLED scrollbar\n");
+		infoPtr->flags = ESB_DISABLE_BOTH;
+	    }
+
             if (lpCreat->style & SBS_SIZEBOX)
             {
                 FIXME("Unimplemented style SBS_SIZEBOX.\n" );
@@ -1204,7 +1213,18 @@
         if (!hUpArrow) SCROLL_LoadBitmaps();
         TRACE("ScrollBar creation, hwnd=%04x\n", hwnd );
         return 0;
-	
+
+    case WM_ENABLE:
+        {
+	    SCROLLBAR_INFO *infoPtr;
+	    if ((infoPtr = SCROLL_GetScrollInfo( hwnd, SB_CTL )))
+	    {
+		infoPtr->flags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH;
+		SCROLL_RefreshScrollBar(hwnd, SB_CTL, TRUE, TRUE);
+	    }
+	}
+	return 0;
+
     case WM_LBUTTONDOWN:
         {
 	    POINT pt;