Issue #24293: Fixes installer colors to use system settings throughout.

This commit is contained in:
Steve Dower 2015-05-26 20:46:11 -07:00
parent e328323cf7
commit c30a6ce59d
2 changed files with 10 additions and 10 deletions

View file

@ -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)) {