X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5100cabffa34c38db26884577113d01f21cda446..94e2ed3b8db0220160c0b939782cd46914ec073a:/src/msw/ownerdrw.cpp?ds=inline diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index f0f1223260..9e37e54ada 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -2,7 +2,7 @@ // Name: msw/ownerdrw.cpp // Purpose: implementation of wxOwnerDrawn class // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 13.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -44,8 +44,8 @@ // ctor // ---- -wxOwnerDrawn::wxOwnerDrawn(const wxString& str, - bool bCheckable, bool bMenuItem) +wxOwnerDrawn::wxOwnerDrawn(const wxString& str, + bool bCheckable, bool WXUNUSED(bMenuItem)) : m_strName(str) { m_bCheckable = bCheckable; @@ -71,22 +71,44 @@ size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth; bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) { wxMemoryDC dc; - dc.SetFont(GetFont()); - // ## ugly... - wxChar *szStripped = new wxChar[m_strName.Len()]; - wxStripMenuCodes((wxChar *)m_strName.c_str(), szStripped); - wxString str = szStripped; - delete [] szStripped; + wxString str = wxStripMenuCodes(m_strName); // # without this menu items look too tightly packed (at least under Windows) str += wxT('W'); // 'W' is typically the widest letter + if (m_font.Ok()) + dc.SetFont(GetFont()); + dc.GetTextExtent(str, (long *)pwidth, (long *)pheight); // JACS: items still look too tightly packed, so adding 2 pixels. (*pheight) = (*pheight) + 2; + // Ray Gilbert's changes - Corrects the problem of a BMP + // being placed next to text in a menu item, and the BMP does + // not match the size expected by the system. This will + // resize the space so the BMP will fit. Without this, BMPs + // must be no larger or smaller than 16x16. + if (m_bmpChecked.Ok()) + { + // Is BMP height larger then text height? + size_t adjustedHeight = m_bmpChecked.GetHeight() + + wxSystemSettings::GetSystemMetric(wxSYS_EDGE_Y); + if (*pheight < adjustedHeight) + *pheight = adjustedHeight; + + // Does BMP encroach on default check menu position? + size_t adjustedWidth = m_bmpChecked.GetWidth() + + (wxSystemSettings::GetSystemMetric(wxSYS_EDGE_X) * 2); + if (ms_nDefaultMarginWidth < adjustedWidth) + *pwidth += adjustedWidth - ms_nDefaultMarginWidth; + + // Do we need to widen margin to fit BMP? + if ((size_t)GetMarginWidth() < adjustedWidth) + SetMarginWidth(adjustedWidth); + } + m_nHeight = *pheight; // remember height for use in OnDrawItem return TRUE; @@ -105,7 +127,10 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) #endif // draw the item -bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus st) +bool wxOwnerDrawn::OnDrawItem(wxDC& dc, + const wxRect& rc, + wxODAction act, + wxODStatus st) { // we do nothing on focus change if ( act == wxODFocusChanged ) @@ -127,7 +152,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt colBack = m_colBack.Ok() ? ToRGB(m_colBack) : GetSysColor(COLOR_WINDOW); colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT); } - + #ifdef O_DRAW_NATIVE_API #define hdc (HDC)dc.GetHDC() COLORREF colOldText = ::SetTextColor(hdc, colText), @@ -140,10 +165,10 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // select the font and draw the text // --------------------------------- - // determine where to draw and leave space for a check-mark. + // determine where to draw and leave space for a check-mark. int x = rc.x + GetMarginWidth(); - // using native API because it reckognizes '&' + // using native API because it reckognizes '&' #ifdef O_DRAW_NATIVE_API int nPrevMode = SetBkMode(hdc, TRANSPARENT); HBRUSH hbr = CreateSolidBrush(colBack), @@ -165,10 +190,22 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt } HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont); - DrawState(hdc, NULL, NULL, - (LPARAM)(const wxChar *)m_strName, m_strName.Length(), + DrawState(hdc, NULL, NULL, + (LPARAM)m_strName.c_str(), m_strName.length(), x, rc.y, rc.GetWidth(), rc.GetHeight(), - DST_PREFIXTEXT | ( st & wxODDisabled ? DSS_DISABLED : 0) ); + DST_PREFIXTEXT | (st & wxODDisabled ? DSS_DISABLED : 0)); + + if ( !m_strAccel.empty() ) + { + RECT r; + r.top = rc.GetTop(); + r.left = rc.GetLeft(); + r.right = rc.GetRight() - GetMarginWidth(); + r.bottom = rc.GetBottom(); + + DrawText(hdc, m_strAccel, m_strAccel.length(), &r, + DT_SINGLELINE | DT_RIGHT | DT_VCENTER); + } (void)SelectObject(hdc, hPrevBrush); (void)SelectObject(hdc, hPrevFont); @@ -184,7 +221,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt if ( st & wxODChecked ) { // using native APIs for performance and simplicity #ifdef O_DRAW_NATIVE_API - // what goes on: DrawFrameControl creates a b/w mask, + // what goes on: DrawFrameControl creates a b/w mask, // then we copy it to screen to have right colors // first create a monochrome bitmap in a memory DC @@ -202,7 +239,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt } // finally copy it to screen DC and clean up - BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, + BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, hdcMem, 0, 0, SRCCOPY); DeleteDC(hdcMem); @@ -227,16 +264,20 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // there should be enough place! wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); + int heightDiff = (m_nHeight - nBmpHeight); +// if (heightDiff = -1) +// heightDiff = -2; + //MT: blit with mask enabled. - dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, - rc.y + (m_nHeight - nBmpHeight) /2, - nBmpWidth, nBmpHeight, + dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, + rc.y + heightDiff / 2, + nBmpWidth, nBmpHeight, &dcMem, 0, 0, wxCOPY, TRUE); if ( st & wxODSelected ) { #ifdef O_DRAW_NATIVE_API - RECT rectBmp = { rc.GetLeft(), rc.GetTop(), - rc.GetLeft() + GetMarginWidth(), + RECT rectBmp = { rc.GetLeft(), rc.GetTop(), + rc.GetLeft() + GetMarginWidth(), rc.GetTop() + m_nHeight }; SetBkColor(hdc, colBack); DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT);