X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ac7be7a9f08c036273e028f2c9d400b6f879005..44f5b995740b69ba222e92a5f7da87080afe4367:/src/msw/ownerdrw.cpp?ds=sidebyside diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 40aad406ba..4baece7467 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -6,7 +6,7 @@ // Created: 13.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -46,7 +46,7 @@ // ctor // ---- wxOwnerDrawn::wxOwnerDrawn(const wxString& str, - bool bCheckable, bool WXUNUSED(bMenuItem)) + bool bCheckable, bool bMenuItem) : m_strName(str) { #if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK) @@ -64,9 +64,23 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str, ms_nLastMarginWidth = nm.iMenuWidth; } - wxNativeFontInfo info; - memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT)); - m_font.Create(info); + if (bMenuItem) + { + static wxFont menu_font; + if (!menu_font.Ok()) + { + // create menu font + wxNativeFontInfo info; + memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT)); + menu_font.Create(info); + } + + m_font = menu_font; + } + else + { + m_font = *wxNORMAL_FONT; + } #else // windows clean install default m_nMinHeight = 18; @@ -98,14 +112,22 @@ size_t wxOwnerDrawn::ms_nLastMarginWidth = 0; // ------- // get size of the item +// The item size includes the menu string, the accel string, +// the bitmap and size for a submenu expansion arrow... bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) { wxMemoryDC dc; 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 we have a valid accel string, then pad out + // the menu string so the menu and accel string are not + // placed ontop of eachother. + if ( !m_strAccel.empty() ) + { + str.Pad(str.Length()%8); + str += m_strAccel; + } if (m_font.Ok()) dc.SetFont(GetFont()); @@ -121,9 +143,13 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) int accel_width, accel_height; dc.GetTextExtent(m_strAccel, &accel_width, &accel_height); - *pwidth += (accel_width + 16); + *pwidth += accel_width; } + // add space at the end of the menu for the submenu expansion arrow + // this will also allow offsetting the accel string from the right edge + *pwidth += (size_t) (GetDefaultMarginWidth() * 1.5); + // JACS: items still look too tightly packed, so adding 5 pixels. (*pheight) = (*pheight) + 5; @@ -143,14 +169,21 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // Does BMP encroach on default check menu position? size_t adjustedWidth = m_bmpChecked.GetWidth() + (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2); - if (ms_nDefaultMarginWidth < adjustedWidth) - *pwidth += adjustedWidth - ms_nDefaultMarginWidth; +// if (ms_nDefaultMarginWidth < adjustedWidth) +// *pwidth += adjustedWidth - ms_nDefaultMarginWidth; // Do we need to widen margin to fit BMP? - if ((size_t)GetMarginWidth() < adjustedWidth) + if ((size_t)GetMarginWidth() != adjustedWidth) SetMarginWidth(adjustedWidth); + + // add the size of the bitmap to our total size... + *pwidth += GetMarginWidth(); } + // add the size of the bitmap to our total size - even if we don't have + // a bitmap we leave room for one... + *pwidth += GetMarginWidth(); + // make sure that this item is at least as // tall as the user's system settings specify if (*pheight < m_nMinHeight) @@ -169,7 +202,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // get drawn embossed? How can we tell DrawState that we don't want the // embossing? -#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__) +#if defined(__WIN32__) && !defined(__SYMANTEC__) && !defined(__TWIN32__) #define O_DRAW_NATIVE_API // comments below explain why I use it #endif @@ -241,8 +274,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, FillRect(hdc, &rectFill, hbr); - DeleteObject(hbr); - // use default font if no font set HFONT hfont; if ( m_font.Ok() ) { @@ -257,27 +288,33 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, wxString strMenuText = m_strName.BeforeFirst('\t'); + SIZE sizeRect; + GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect); ::DrawState(hdc, NULL, NULL, (LPARAM)strMenuText.c_str(), strMenuText.length(), - x, rc.y + 1, rc.GetWidth(), rc.GetHeight(), + x, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically + rc.GetWidth()-GetMarginWidth(), sizeRect.cy, DST_PREFIXTEXT | (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); if ( !m_strAccel.empty() ) { - int accel_width, accel_height; - dc.GetTextExtent(m_strAccel, &accel_width, &accel_height); - + // right align accel string with right edge of menu ( offset by the margin width ) + ::SetTextAlign(hdc, TA_RIGHT); ::DrawState(hdc, NULL, NULL, (LPARAM)m_strAccel.c_str(), m_strAccel.length(), - rc.GetRight() - accel_width - 16, rc.y + 1, 0, 0, + rc.GetWidth()-(GetMarginWidth()), rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0), + rc.GetWidth()-GetMarginWidth(), sizeRect.cy, DST_TEXT | (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); + ::SetTextAlign(hdc, TA_LEFT); } (void)SelectObject(hdc, hPrevBrush); (void)SelectObject(hdc, hPrevFont); (void)SetBkMode(hdc, nPrevMode); + + DeleteObject(hbr); #else dc.SetFont(GetFont()); dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y); @@ -337,7 +374,13 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, &dcMem, 0, 0, wxCOPY, TRUE /* use mask */); if ( st & wxODSelected ) { - + #ifdef O_DRAW_NATIVE_API + RECT rectBmp = { rc.GetLeft(), rc.GetTop(), + rc.GetLeft() + GetMarginWidth(), + rc.GetTop() + m_nHeight-1 }; + SetBkColor(hdc, colBack); + DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT); + #else int x1, y1, x2, y2; x1 = rc.x; y1 = rc.y; @@ -350,6 +393,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, dc.SetPen(*wxGREY_PEN); dc.DrawLine(x1, y2-1, x2, y2-1); dc.DrawLine(x2, y1, x2, y2); + #endif //O_DRAW_NATIVE_API } } }