Changeset 2611 for trunk/src/user32/scroll.cpp

Timestamp:

Feb 3, 2000, 6:13:03 PM (26 years ago)

Author:

cbratschi

Message:

merged controls with wine 20000130

File:

• trunk/src/user32/scroll.cpp (modified) (3 diffs)

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.32 2000-01-18 20:10:44 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.33 2000-02-03 17:13:01 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -8 +8 @@
  * Copyright 1994, 1996 Alexandre Julliard
  *
- * WINE version: 991031
+ * WINE version: 20000130
  *
  * Status:  complete
@@ -1260 +1260 @@
     //             infoPtr->MinVal, infoPtr->MaxVal );
 
+    /* don't change the scrollbar state if SetScrollInfo
+     * is just called with SIF_DISABLENOSCROLL
+     */
+    if(!(info->fMask & SIF_ALL)) goto done;
+
     /* Check if the scrollbar should be hidden or disabled */
     if (info->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL))