#if wxUSE_OWNER_DRAWN
+#ifndef SPI_GETKEYBOARDCUES
+#define SPI_GETKEYBOARDCUES 0x100A
+#endif
+
class wxMSWSystemMenuFontModule : public wxModule
{
public:
wxNativeFontInfo info;
memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT));
ms_systemMenuFont->Create(info);
+
+ if (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &ms_showCues, 0) == 0)
+ ms_showCues = true;
#endif
return true;
static wxFont* ms_systemMenuFont;
static int ms_systemMenuButtonWidth; // windows clean install default
static int ms_systemMenuHeight; // windows clean install default
+ static bool ms_showCues;
private:
DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule)
};
-// these static variables are by the wxMSWSystemMenuFontModule object
+// these static variables are from the wxMSWSystemMenuFontModule object
// and reflect the system settings returned by the Win32 API's
// SystemParametersInfo() call.
wxFont* wxMSWSystemMenuFontModule::ms_systemMenuFont = NULL;
int wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth = 18; // windows clean install default
int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 18; // windows clean install default
+bool wxMSWSystemMenuFontModule::ms_showCues = true;
IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
// menu icons and checkmarks
if (ms_nDefaultMarginWidth == 0)
{
- ms_nDefaultMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth;
- ms_nLastMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth;
+ ms_nDefaultMarginWidth = ::GetSystemMetrics(SM_CXMENUCHECK) + wxSystemSettings::GetMetric(wxSYS_EDGE_X);
+ ms_nLastMarginWidth = ms_nDefaultMarginWidth;
}
if (wxMSWSystemMenuFontModule::ms_systemMenuFont->Ok() && bMenuItem)
wxString str = wxStripMenuCodes(m_strName);
// 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.
+ // the menu string so that the menu and accel string are not
+ // placed on top of each other.
if ( !m_strAccel.empty() )
{
str.Pad(str.Length()%8);
dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
- // 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 += GetDefaultMarginWidth() + 16;
-
// increase size to accommodate bigger bitmaps if necessary
if (m_bmpChecked.Ok())
{
SetMarginWidth(adjustedWidth);
}
+ // 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 += GetMarginWidth() + 16;
+
+ // add a 4-pixel separator, otherwise menus look cluttered
+ *pwidth += 4;
+
// make sure that this item is at least as
// tall as the user's system settings specify
if (*pheight < m_nMinHeight)
else {
// fall back to default colors if none explicitly specified
colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack)
- : GetSysColor(COLOR_WINDOW);
+ : GetSysColor(COLOR_MENU);
colText = m_colText.Ok() ? wxColourToPalRGB(m_colText)
- : GetSysColor(COLOR_WINDOWTEXT);
+ : GetSysColor(COLOR_MENUTEXT);
}
if ( ( GetRValue( menu_bg_color ) >= 0xf0 &&
GetGValue( menu_bg_color ) >= 0xf0 &&
GetBValue( menu_bg_color ) >= 0xf0 )
- // ... or if the menu item is disabled
- || ( st & wxODDisabled )
)
{
draw_bitmap_edge = false;
COLORREF colOldText = ::SetTextColor(hdc, colText),
colOldBack = ::SetBkColor(hdc, colBack);
- int margin = GetMarginWidth() + wxSystemSettings::GetMetric(wxSYS_EDGE_X);
+ // *2, as in wxSYS_EDGE_Y
+ int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X);
// select the font and draw the text
// ---------------------------------
// determine where to draw and leave space for a check-mark.
- int xText = rc.x + margin;
+ // + 1 pixel to separate the edge from the highlight rectangle
+ int xText = rc.x + margin + 1;
- // using native API because it reckognizes '&'
+ // using native API because it recognizes '&'
int nPrevMode = SetBkMode(hdc, TRANSPARENT);
HBRUSH hbr = CreateSolidBrush(colBack),
hPrevBrush = (HBRUSH)SelectObject(hdc, hbr);
RECT rectFill = { rc.GetLeft(), rc.GetTop(),
rc.GetRight() + 1, rc.GetBottom() + 1 };
- if ( (st & wxODSelected) && m_bmpChecked.Ok() ) {
+ if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge ) {
// only draw the highlight under the text, not under
// the bitmap or checkmark
rectFill.left = xText;
wxString strMenuText = m_strName.BeforeFirst('\t');
+ xText += 3; // separate text from the highlight rectangle
+
SIZE sizeRect;
- GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect);
+ ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.Length(), &sizeRect);
::DrawState(hdc, NULL, NULL,
(LPARAM)strMenuText.c_str(), strMenuText.length(),
- xText, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically
+ xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically
rc.GetWidth()-margin, sizeRect.cy,
DST_PREFIXTEXT |
- (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
+ (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0) |
+ (((st & wxODHidePrefix) && !wxMSWSystemMenuFontModule::ms_showCues) ? 512 : 0)); // 512 == DSS_HIDEPREFIX
// ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO
- // as last parameter in DrawState() (at least with Windows98). So we have
+ // as the last parameter in DrawState() (at least with Windows98). So we have
// to take care of right alignment ourselves.
if ( !m_strAccel.empty() )
{
// margin width )
::DrawState(hdc, NULL, NULL,
(LPARAM)m_strAccel.c_str(), m_strAccel.length(),
- rc.GetWidth()-margin-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
- rc.GetWidth()-margin-accel_width, sizeRect.cy,
+ rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
+ 0, 0,
DST_TEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
}
int nBmpWidth = bmp.GetWidth(),
nBmpHeight = bmp.GetHeight();
- // there should be enough place!
+ // there should be enough space!
wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
int heightDiff = m_nHeight - nBmpHeight;
nBmpWidth, nBmpHeight,
&dcMem, 0, 0, wxCOPY, true /* use mask */);
- if ( st & wxODSelected && draw_bitmap_edge ) {
+ if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge ) {
RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
rc.GetLeft() + margin,
rc.GetTop() + m_nHeight };
SetBkColor(hdc, colBack);
- DrawEdge(hdc, &rectBmp, BDR_RAISEDOUTER, BF_SOFT | BF_RECT);
+ DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT);
}
}
}
projects / wxWidgets.git / blobdiff