Commit 08bd265f authored by Igor Tarasov's avatar Igor Tarasov Committed by Alexandre Julliard

comctl32: Make REBAR_StyleChanged respect wParam.

parent 311d260a
...@@ -3469,19 +3469,19 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -3469,19 +3469,19 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT 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", TRACE("current style=%08x, styleOld=%08x, style being set to=%08x\n",
infoPtr->dwStyle, ss->styleOld, ss->styleNew); infoPtr->dwStyle, lpStyle->styleOld, lpStyle->styleNew);
infoPtr->orgStyle = infoPtr->dwStyle = ss->styleNew; if (nType == GWL_STYLE)
if (GetWindowTheme (infoPtr->hwndSelf)) {
infoPtr->dwStyle &= ~WS_BORDER; infoPtr->orgStyle = infoPtr->dwStyle = lpStyle->styleNew;
/* maybe it should be COMMON_STYLES like in toolbar */ if (GetWindowTheme (infoPtr->hwndSelf))
if ((ss->styleNew ^ ss->styleOld) & CCS_VERT) infoPtr->dwStyle &= ~WS_BORDER;
REBAR_Layout(infoPtr); /* maybe it should be COMMON_STYLES like in toolbar */
if ((lpStyle->styleNew ^ lpStyle->styleOld) & CCS_VERT)
REBAR_Layout(infoPtr);
}
return FALSE; return FALSE;
} }
...@@ -3715,7 +3715,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -3715,7 +3715,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return REBAR_Size (infoPtr, wParam, lParam); return REBAR_Size (infoPtr, wParam, lParam);
case WM_STYLECHANGED: case WM_STYLECHANGED:
return REBAR_StyleChanged (infoPtr, lParam); return REBAR_StyleChanged (infoPtr, wParam, (LPSTYLESTRUCT)lParam);
case WM_THEMECHANGED: case WM_THEMECHANGED:
return theme_changed (infoPtr); return theme_changed (infoPtr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment