Index: src/ch/MiniViewDlg.cpp =================================================================== diff -u -N -r33b33baa373533d0cff8ea5d25154b370f2b2e05 -r547f865c69434c14c6f16e4b529d4198f6fe2040 --- src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 33b33baa373533d0cff8ea5d25154b370f2b2e05) +++ src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 547f865c69434c14c6f16e4b529d4198f6fe2040) @@ -20,7 +20,6 @@ #include "MiniViewDlg.h" #include "ch.h" #include -#include "MemDC.h" #include "CfgProperties.h" #include "resource.h" #include "../libchengine/TTaskManager.h" @@ -606,10 +605,10 @@ ncdc.LineTo(rcWindow.right, rcWindow.bottom); // memdc - CMemDC dc(&ncdc, &rcWindow); + CMemDC dc(ncdc, &rcWindow); COLORREF crLeft=GetSysColor(m_bActive ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); - dc.FillSolidRect(&rcWindow, crLeft); + dc.GetDC().FillSolidRect(&rcWindow, crLeft); // caption text CString strWindow; @@ -626,11 +625,11 @@ CFont font; font.CreateFontIndirect(&ncm.lfSmCaptionFont); - dc.SelectObject(&font); + dc.GetDC().SelectObject(&font); - dc.SetTextColor(GetSysColor(COLOR_CAPTIONTEXT)); - dc.SetBkMode(TRANSPARENT); - dc.DrawText(strWindow, &rcWindow, DT_END_ELLIPSIS | DT_VCENTER | DT_LEFT | DT_NOCLIP | DT_SINGLELINE); + dc.GetDC().SetTextColor(GetSysColor(COLOR_CAPTIONTEXT)); + dc.GetDC().SetBkMode(TRANSPARENT); + dc.GetDC().DrawText(strWindow, &rcWindow, DT_END_ELLIPSIS | DT_VCENTER | DT_LEFT | DT_NOCLIP | DT_SINGLELINE); // button drawing GetClientRect(&rcWindow); @@ -651,7 +650,7 @@ m_bdButtons[i].rcButton.right=m_bdButtons[i].rcButton.left+iWidth; m_bdButtons[i].rcButton.bottom=m_bdButtons[i].rcButton.top+iHeight; - m_bdButtons[i].pfnCallbackFunc(this, MSG_DRAWBUTTON, &m_bdButtons[i], &dc); + m_bdButtons[i].pfnCallbackFunc(this, MSG_DRAWBUTTON, &m_bdButtons[i], &dc.GetDC()); } }