X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7527e3f2178b3a527c50ffda6bb059f8ff8acce..2a31049201e9c1ff9f515eb9d144ae392f4b4e5a:/src/msw/ownerdrw.cpp?ds=sidebyside diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index d60bc8c408..2c2ec2a8ea 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -33,6 +33,8 @@ #include "wx/ownerdrw.h" #include "wx/menuitem.h" +#if wxUSE_OWNER_DRAWN + // ============================================================================ // implementation of wxOwnerDrawn class @@ -74,7 +76,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) delete [] szStripped; // # without this menu items look too tightly packed (at least under Windows) - str += _T('W'); // 'W' is typically the widest letter + str += wxT('W'); // 'W' is typically the widest letter dc.GetTextExtent(str, (long *)pwidth, (long *)pheight); @@ -140,12 +142,14 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // using native API because it reckognizes '&' #ifdef O_DRAW_NATIVE_API int nPrevMode = SetBkMode(hdc, TRANSPARENT); - HBRUSH hbr = CreateSolidBrush(colBack), - hPrevBrush = (HBRUSH) SelectObject(hdc, hbr); + HBRUSH hbr = CreateSolidBrush(colBack), + hPrevBrush = (HBRUSH)SelectObject(hdc, hbr); RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() }; FillRect(hdc, &rectAll, hbr); + DeleteObject(hbr); + // use default font if no font set HFONT hfont; if ( m_font.Ok() ) { @@ -186,14 +190,19 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // then draw a check mark into it RECT rect = { 0, 0, GetMarginWidth(), m_nHeight }; + if ( m_nHeight > 0 ) + { #ifndef __SC__ - DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); + DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); #endif + } // finally copy it to screen DC and clean up BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, hdcMem, 0, 0, SRCCOPY); + DeleteDC(hdcMem); + DeleteObject(hbmpCheck); #else // #### to do: perhaps using Marlett font (create equiv. font under X) // wxFAIL("not implemented"); @@ -214,10 +223,11 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // there should be enough place! wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); + //MT: blit with mask enabled. dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, rc.y + (m_nHeight - nBmpHeight) /2, nBmpWidth, nBmpHeight, - &dcMem, 0, 0, wxCOPY); + &dcMem, 0, 0, wxCOPY, TRUE); if ( st & wxODSelected ) { #ifdef O_DRAW_NATIVE_API @@ -243,3 +253,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt return TRUE; } + +#endif // wxUSE_OWNER_DRAWN +