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

Timestamp:

May 27, 2003, 11:46:30 AM (22 years ago)

Author:

sandervl

Message:

Do not send WM_STYLECHANGING/ED messages when the scrollbar control is shown or hidden.

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.49 2003-04-08 13:45:04 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.50 2003-05-27 09:46:30 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -17 +17 @@
 #include <os2win.h>
 #include "controls.h"
+#include "ctrlconf.h"
 #include "scroll.h"
 #include "win32wbase.h"
@@ -1654 +1655 @@
         {
             fShowH = !(dwStyle & WS_HSCROLL);
-            SetWindowLongA(hwnd, GWL_STYLE, dwStyle | WS_HSCROLL);
+            dwStyle |= WS_HSCROLL;
         }
         else  /* hide it */
         {
             fShowH = (dwStyle & WS_HSCROLL);
-            SetWindowLongA(hwnd, GWL_STYLE, dwStyle & ~WS_HSCROLL);
+            dwStyle &= ~WS_HSCROLL;
         }
         if( nBar == SB_HORZ )
@@ -1672 +1673 @@
         {
             fShowV = !(dwStyle & WS_VSCROLL);
-            SetWindowLongA(hwnd, GWL_STYLE, dwStyle | WS_VSCROLL);
+            dwStyle |= WS_VSCROLL;
         }
         else  /* hide it */
         {
             fShowV = (dwStyle & WS_VSCROLL);
-            SetWindowLongA(hwnd, GWL_STYLE, dwStyle & ~WS_VSCROLL);
+            dwStyle &= ~WS_VSCROLL;
         }
         if ( nBar == SB_VERT )
@@ -1689 +1690 @@
     if( fShowH || fShowV ) /* frame has been changed, let the window redraw itself */
     {
+        WIN_SetStyle( hwnd, dwStyle );
         SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE
                     | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );