Changeset 10119 for trunk/src

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.

Location:

trunk/src/user32

Files:

• ctrlconf.h (modified) (2 diffs)
• scroll.cpp (modified) (5 diffs)
• win32wmisc.cpp (modified) (2 diffs)
• windowword.cpp (modified) (3 diffs)

trunk/src/user32/ctrlconf.h

@@ -1 @@
-/* $Id: ctrlconf.h,v 1.2 2003-01-03 16:35:51 sandervl Exp $ */
+/* $Id: ctrlconf.h,v 1.3 2003-05-27 09:46:30 sandervl Exp $ */
 /*
  * Win32 common controls
@@ -21 +21 @@
 #define  WIN_SuspendWndsLock()          0
 #define  WIN_RestoreWndsLock(ipreviousLock)
+
+//Set the style of a window without sending WM_STYLECHANGING/ED messages
+void WIN_SetStyle(HWND hwnd, DWORD dwStyle);
 
 //WIN31 look only -> we don't use it

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 );

trunk/src/user32/win32wmisc.cpp

@@ -1 @@
-/* $Id: win32wmisc.cpp,v 1.2 2003-01-03 16:35:57 sandervl Exp $ */
+/* $Id: win32wmisc.cpp,v 1.3 2003-05-27 09:46:30 sandervl Exp $ */
 /*
  * Misc. functions for window management
@@ -20 +20 @@
 #include <stdarg.h>
 #include <assert.h>
-#include <misc.h>
+#include <dbglog.h>
 #include <win32wnd.h>
 #include <heapstring.h>

trunk/src/user32/windowword.cpp

@@ -1 @@
-/* $Id: windowword.cpp,v 1.12 2001-10-28 10:38:14 sandervl Exp $ */
+/* $Id: windowword.cpp,v 1.13 2003-05-27 09:46:30 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
  */
 #include <os2win.h>
-#include <misc.h>
+#include <dbglog.h>
+#include <ctrlconf.h>
 
 #include <win32wbase.h>
@@ -18 +19 @@
 #include "dbglocal.h"
 
+//******************************************************************************
+//Update the window style without sending WM_STYLECHANGING/ED
+//******************************************************************************
+void WIN_SetStyle(HWND hwnd, DWORD dwStyle)
+{
+ Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(window)
+    {
+        window->setStyle(dwStyle);
+        RELEASE_WNDOBJ(window);
+        return;
+    }
+    else {
+        dprintf(("WIN_SetStyle window %x not found!", hwnd));
+        return;
+    }
+}
 //******************************************************************************
 //******************************************************************************