X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36866abca3b49a0fb4fbaddedd1d443cbc978f89..bd412bc6b6b4d824e83a8eff5c694d5692b46f45:/src/msw/ownerdrw.cpp diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 12f6d210bc..3dfc9d0065 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -16,9 +16,10 @@ #pragma hdrstop #endif +#if wxUSE_OWNER_DRAWN + #ifndef WX_PRECOMP #include "wx/window.h" - #include "wx/msw/private.h" #include "wx/font.h" #include "wx/bitmap.h" #include "wx/image.h" @@ -33,51 +34,89 @@ #include "wx/ownerdrw.h" #include "wx/fontutil.h" -#if wxUSE_OWNER_DRAWN +#include "wx/msw/private.h" +#include "wx/msw/private/metrics.h" +#include "wx/msw/dc.h" #ifndef SPI_GETKEYBOARDCUES #define SPI_GETKEYBOARDCUES 0x100A #endif +#ifndef DSS_HIDEPREFIX +#define DSS_HIDEPREFIX 0x0200 +#endif + class wxMSWSystemMenuFontModule : public wxModule { public: - virtual bool OnInit() { - ms_systemMenuFont = new wxFont; + return true; + } -#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK) - NONCLIENTMETRICS nm; - nm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0); + virtual void OnExit() + { + if ( ms_systemMenuFont ) + { + delete ms_systemMenuFont; + ms_systemMenuFont = NULL; + } + } - ms_systemMenuButtonWidth = nm.iMenuHeight; - ms_systemMenuHeight = nm.iMenuHeight; + static const wxFont& GetSystemMenuFont() + { + if ( !ms_systemMenuFont ) + DoInitFont(); - // create menu font - wxNativeFontInfo info; - memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT)); - ms_systemMenuFont->Create(info); + return *ms_systemMenuFont; + } - if (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &ms_showCues, 0) == 0) - ms_showCues = true; -#endif + static int GetSystemMenuHeight() + { + if ( !ms_systemMenuHeight ) + DoInitMetrics(); - return true; + return ms_systemMenuHeight; } - virtual void OnExit() + static bool AlwaysShowCues() { - delete ms_systemMenuFont; - ms_systemMenuFont = NULL; + if ( !ms_systemMenuHeight ) + DoInitMetrics(); + + return ms_alwaysShowCues; } - 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: + static void DoInitMetrics() + { + // iMenuHeight is the menu bar height and the menu items are less tall, + // although I don't know by how much -- below is the value for my system + ms_systemMenuHeight = wxMSWImpl::GetNonClientMetrics().iMenuHeight - 4; + + wxASSERT_MSG( ms_systemMenuHeight > 0, + "menu height should be positive" ); + + if ( ::SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, + &ms_alwaysShowCues, 0) == 0 ) + { + // if it's not supported, we must be on an old Windows version + // which always shows them + ms_alwaysShowCues = true; + } + } + + static void DoInitFont() + { + ms_systemMenuFont = new + wxFont(wxNativeFontInfo(wxMSWImpl::GetNonClientMetrics().lfMenuFont)); + } + + static wxFont* ms_systemMenuFont; + static int ms_systemMenuHeight; + static bool ms_alwaysShowCues; + + DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule) }; @@ -86,9 +125,8 @@ private: // 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; +int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 0; +bool wxMSWSystemMenuFontModule::ms_alwaysShowCues = false; IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule) @@ -138,7 +176,6 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str, m_isMenuItem = bMenuItem; m_nHeight = 0; m_nMarginWidth = ms_nLastMarginWidth; - m_nMinHeight = wxMSWSystemMenuFontModule::ms_systemMenuHeight; } wxOwnerDrawn::~wxOwnerDrawn() @@ -151,7 +188,7 @@ bool wxOwnerDrawn::IsMenuItem() const } -// these items will be set during the first invocation of the c'tor, +// these items will be set during the first invocation of the ctor, // because the values will be determined by checking the system settings, // which is a chunk of code size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 0; @@ -167,7 +204,7 @@ wxFont wxOwnerDrawn::GetFontToUse() const if ( !font.Ok() ) { if ( IsMenuItem() ) - font = *wxMSWSystemMenuFontModule::ms_systemMenuFont; + font = wxMSWSystemMenuFontModule::GetSystemMenuFont(); if ( !font.Ok() ) font = *wxNORMAL_FONT; @@ -216,10 +253,9 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // increase size to accommodate bigger bitmaps if necessary if (m_bmpChecked.Ok()) { - // Is BMP height larger then text height? - size_t adjustedHeight = m_bmpChecked.GetHeight() + - 2*wxSystemSettings::GetMetric(wxSYS_EDGE_Y); - if (*pheight < adjustedHeight) + // Is BMP height larger than text height? + size_t adjustedHeight = m_bmpChecked.GetHeight(); + if ( *pheight < adjustedHeight ) *pheight = adjustedHeight; const size_t widthBmp = m_bmpChecked.GetWidth(); @@ -239,8 +275,9 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) *pwidth += 4; // make sure that this item is at least as tall as the system menu height - if ( *pheight < m_nMinHeight ) - *pheight = m_nMinHeight; + const size_t heightStd = wxMSWSystemMenuFontModule::GetSystemMenuHeight(); + if ( *pheight < heightStd ) + *pheight = heightStd; // remember height for use in OnDrawItem m_nHeight = *pheight; @@ -312,7 +349,8 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, } - HDC hdc = GetHdcOf(dc); + wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); + HDC hdc = GetHdcOf(*impl); COLORREF colOldText = ::SetTextColor(hdc, colText), colOldBack = ::SetBkColor(hdc, colBack); @@ -357,14 +395,28 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, SIZE sizeRect; ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.length(), &sizeRect); - ::DrawState(hdc, NULL, NULL, - (LPARAM)strMenuText.wx_str(), - strMenuText.length(), - 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 & wxODHidePrefix) && !wxMSWSystemMenuFontModule::ms_showCues) ? 512 : 0)); // 512 == DSS_HIDEPREFIX + + int flags = DST_PREFIXTEXT; + if ( (st & wxODDisabled) && !(st & wxODSelected) ) + flags |= DSS_DISABLED; + + if ( (st & wxODHidePrefix) && + !wxMSWSystemMenuFontModule::AlwaysShowCues() ) + flags |= DSS_HIDEPREFIX; + + ::DrawState + ( + hdc, + NULL, + NULL, + (LPARAM)strMenuText.wx_str(), + strMenuText.length(), + xText, + rc.y + (rc.GetHeight() - sizeRect.cy + 1)/2, // centre vertically + rc.GetWidth() - margin, + sizeRect.cy, + flags + ); // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO // as the last parameter in DrawState() (at least with Windows98). So we have