diff --git a/dialogs/TipDlg.cpp b/dialogs/TipDlg.cpp index b006ab45..2dcdbe23 100644 --- a/dialogs/TipDlg.cpp +++ b/dialogs/TipDlg.cpp @@ -165,15 +165,13 @@ void CTipDlg::GetNextTipString(CString& strNext) HBRUSH CTipDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) { - if (pWnd->GetDlgCtrlID() == IDC_TIPSTRING) + if (pWnd->GetDlgCtrlID() == IDC_TIPSTRING) return (HBRUSH)GetStockObject(WHITE_BRUSH); - else if (pWnd->GetDlgCtrlID() == IDC_STARTUP) - return CDialog::OnCtlColor(pDC, pWnd, nCtlColor); - else if (nCtlColor == CTLCOLOR_STATIC) - /* Visual styles enabled causes the things we draw in our WM_PAINT - * to get cleared (and not redrawn) if we do not use a hollow brush here. - * Likely the default behaviour differs when using theming. -JW */ - return (HBRUSH)GetStockObject(HOLLOW_BRUSH); + else if ((pWnd->GetDlgCtrlID() == IDC_BULB) || (pWnd->GetDlgCtrlID() == IDC_STATIC)) + /* Visual styles enabled causes the things we draw in our WM_PAINT + * to get cleared (and not redrawn) if we do not use a hollow brush here. + * Likely the default behaviour differs when using theming. -JW */ + return (HBRUSH)GetStockObject(HOLLOW_BRUSH); return CDialog::OnCtlColor(pDC, pWnd, nCtlColor); } diff --git a/stdafx.h b/stdafx.h index e6a680fe..f319641e 100644 --- a/stdafx.h +++ b/stdafx.h @@ -856,7 +856,7 @@ typedef struct * believe this bug can affect us at present as it involves 'loading from files'. Testing thus far seems to * confirm there is no different behaviour in/around the command window with this enabled. -JW */ -#if _MSC_VER > 1200 // doesn't work with Visual Studio 6 +#if _MSC_VER > 1400 // doesn't work with Visual Studio 6 #if defined _M_IX86 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") #elif defined _M_X64