diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-05-27 03:46:29 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-05-27 03:46:29 (GMT) |
| commit | 8b5fb5cfc84d7733b8a62b51c61c765a73ce0108 (patch) | |
| tree | ae72599b5da16e2e2b2ad724cdedd2b326e6c340 /Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | |
| parent | a724304f58da61c500152f427cf8ef5e89b44ce9 (diff) | |
| parent | c30a6ce59d03cc506b1a6164c838d18f6526a004 (diff) | |
| download | cpython-8b5fb5cfc84d7733b8a62b51c61c765a73ce0108.zip cpython-8b5fb5cfc84d7733b8a62b51c61c765a73ce0108.tar.gz cpython-8b5fb5cfc84d7733b8a62b51c61c765a73ce0108.tar.bz2 | |
Issue #24293: Fixes installer colors to use system settings throughout.
Diffstat (limited to 'Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 351218e..7f5af74 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)) { |