From: Steve Dower Date: Wed, 27 May 2015 03:46:11 +0000 (-0700) Subject: Issue #24293: Fixes installer colors to use system settings throughout. X-Git-Tag: v3.5.0b2~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c30a6ce59d03cc506b1a6164c838d18f6526a004;p=python Issue #24293: Fixes installer colors to use system settings throughout. --- diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm index a081850a25..aac71ab047 100644 --- a/Tools/msi/bundle/Default.thm +++ b/Tools/msi/bundle/Default.thm @@ -1,12 +1,12 @@ - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI #(loc.HelpHeader) @@ -74,7 +74,7 @@ #(loc.CustomLocationLabel) - #(loc.CustomLocationHelpLabel) + #(loc.CustomLocationHelpLabel) diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 351218e030..7f5af74eb5 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -371,7 +371,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { hr = BalGetNumericVariable(L"WixBundleElevated", &elevated); checked = ThemeIsControlChecked(_theme, ID_CUSTOM_INSTALL_ALL_USERS_CHECKBOX); ThemeControlElevates(_theme, ID_CUSTOM_INSTALL_BUTTON, checked && (FAILED(hr) || !elevated)); - ThemeShowControl(_theme, ID_CUSTOM_BROWSE_BUTTON_LABEL, checked ? SW_HIDE : SW_SHOW); + ThemeControlEnable(_theme, ID_CUSTOM_BROWSE_BUTTON_LABEL, !checked); ThemeGetTextControl(_theme, ID_TARGETDIR_EDITBOX, &targetDir); if (targetDir) { // Check the current value against the default to see @@ -1489,7 +1489,7 @@ private: wc.hInstance = _hModule; wc.hIcon = hIcon; wc.hCursor = ::LoadCursorW(nullptr, (LPCWSTR)IDC_ARROW); - wc.hbrBackground = _theme->rgFonts[_theme->dwFontId].hBackground; + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wc.lpszMenuName = nullptr; wc.lpszClassName = PYBA_WINDOW_CLASS; if (!::RegisterClassW(&wc)) {