Igor Tarasov : comctl32: Make REBAR_StyleChanged respect wParam.
Alexandre Julliard
julliard at winehq.org
Fri Feb 27 10:02:46 CST 2009
Module: wine
Branch: master
Commit: 08bd265f5293d8bc82fdfc957b41f05cb1c1d016
URL: http://source.winehq.org/git/wine.git/?a=commit;h=08bd265f5293d8bc82fdfc957b41f05cb1c1d016
Author: Igor Tarasov <tarasov.igor at gmail.com>
Date: Fri Feb 27 06:30:03 2009 +0400
comctl32: Make REBAR_StyleChanged respect wParam.
---
dlls/comctl32/rebar.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 89ac420..089da39 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -3469,19 +3469,19 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT
-REBAR_StyleChanged (REBAR_INFO *infoPtr, LPARAM lParam)
+REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle)
{
- STYLESTRUCT *ss = (STYLESTRUCT *)lParam;
-
TRACE("current style=%08x, styleOld=%08x, style being set to=%08x\n",
- infoPtr->dwStyle, ss->styleOld, ss->styleNew);
- infoPtr->orgStyle = infoPtr->dwStyle = ss->styleNew;
- if (GetWindowTheme (infoPtr->hwndSelf))
- infoPtr->dwStyle &= ~WS_BORDER;
- /* maybe it should be COMMON_STYLES like in toolbar */
- if ((ss->styleNew ^ ss->styleOld) & CCS_VERT)
- REBAR_Layout(infoPtr);
-
+ infoPtr->dwStyle, lpStyle->styleOld, lpStyle->styleNew);
+ if (nType == GWL_STYLE)
+ {
+ infoPtr->orgStyle = infoPtr->dwStyle = lpStyle->styleNew;
+ if (GetWindowTheme (infoPtr->hwndSelf))
+ infoPtr->dwStyle &= ~WS_BORDER;
+ /* maybe it should be COMMON_STYLES like in toolbar */
+ if ((lpStyle->styleNew ^ lpStyle->styleOld) & CCS_VERT)
+ REBAR_Layout(infoPtr);
+ }
return FALSE;
}
@@ -3715,7 +3715,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return REBAR_Size (infoPtr, wParam, lParam);
case WM_STYLECHANGED:
- return REBAR_StyleChanged (infoPtr, lParam);
+ return REBAR_StyleChanged (infoPtr, wParam, (LPSTYLESTRUCT)lParam);
case WM_THEMECHANGED:
return theme_changed (infoPtr);
More information about the wine-cvs
mailing list