Commit b1ce93f9 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

msi: Set the text color after calling the window proc.

parent b1cc87cb
...@@ -714,9 +714,6 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -714,9 +714,6 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
info = GetPropW(hWnd, szButtonData); info = GetPropW(hWnd, szButtonData);
if ( info->font )
SetTextColor( (HDC)wParam, info->font->color );
if( msg == WM_CTLCOLORSTATIC && if( msg == WM_CTLCOLORSTATIC &&
( info->attributes & msidbControlAttributesTransparent ) ) ( info->attributes & msidbControlAttributesTransparent ) )
{ {
...@@ -725,6 +722,8 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -725,6 +722,8 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
r = CallWindowProcW(info->oldproc, hWnd, msg, wParam, lParam); r = CallWindowProcW(info->oldproc, hWnd, msg, wParam, lParam);
if ( info->font )
SetTextColor( (HDC)wParam, info->font->color );
switch( msg ) switch( msg )
{ {
......
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