#include "wx/settings.h"
#include "wx/menuitem.h"
#include "wx/module.h"
+ #include "wx/msw/wrapcctl.h"
#endif
#include "wx/ownerdrw.h"
#include "wx/fontutil.h"
#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()
{
- WinStruct<NONCLIENTMETRICS> nm;
- ::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0);
+ return true;
+ }
+
+ virtual void OnExit()
+ {
+ if ( ms_systemMenuFont )
+ {
+ delete ms_systemMenuFont;
+ ms_systemMenuFont = NULL;
+ }
+ }
- ms_systemMenuButtonWidth = nm.iMenuHeight;
+ static const wxFont& GetSystemMenuFont()
+ {
+ if ( !ms_systemMenuFont )
+ DoInitFont();
+ return *ms_systemMenuFont;
+ }
+
+ static int GetSystemMenuHeight()
+ {
+ if ( !ms_systemMenuHeight )
+ DoInitMetrics();
+
+ return ms_systemMenuHeight;
+ }
+
+ static bool AlwaysShowCues()
+ {
+ if ( !ms_systemMenuHeight )
+ DoInitMetrics();
+
+ return ms_alwaysShowCues;
+ }
+
+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 = nm.iMenuHeight - 4;
+ ms_systemMenuHeight = wxMSWImpl::GetNonClientMetrics().iMenuHeight - 4;
- // create menu font
- wxNativeFontInfo info;
- memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT));
- ms_systemMenuFont = new wxFont(info);
+ wxASSERT_MSG( ms_systemMenuHeight > 0,
+ "menu height should be positive" );
if ( ::SystemParametersInfo(SPI_GETKEYBOARDCUES, 0,
- &ms_showCues, 0) == 0 )
+ &ms_alwaysShowCues, 0) == 0 )
{
// if it's not supported, we must be on an old Windows version
// which always shows them
- ms_showCues = true;
+ ms_alwaysShowCues = true;
}
-
- return true;
}
- virtual void OnExit()
+ static void DoInitFont()
{
- delete ms_systemMenuFont;
- ms_systemMenuFont = NULL;
+ ms_systemMenuFont = new
+ wxFont(wxNativeFontInfo(wxMSWImpl::GetNonClientMetrics().lfMenuFont));
}
static wxFont* ms_systemMenuFont;
- static int ms_systemMenuButtonWidth;
static int ms_systemMenuHeight;
- static bool ms_showCues;
+ static bool ms_alwaysShowCues;
+
-private:
DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule)
};
// SystemParametersInfo() call.
wxFont* wxMSWSystemMenuFontModule::ms_systemMenuFont = NULL;
-int wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth = 18;
-int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 18;
-bool wxMSWSystemMenuFontModule::ms_showCues = true;
+int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 0;
+bool wxMSWSystemMenuFontModule::ms_alwaysShowCues = false;
IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
if ( !font.Ok() )
{
if ( IsMenuItem() )
- font = *wxMSWSystemMenuFontModule::ms_systemMenuFont;
+ font = wxMSWSystemMenuFontModule::GetSystemMenuFont();
if ( !font.Ok() )
font = *wxNORMAL_FONT;
dc.GetTextExtent(str, &w, &h);
*pwidth = w;
*pheight = h;
-
- // 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;
}
else // don't draw the text, just the bitmap (if any)
{
if ( *pheight < adjustedHeight )
*pheight = adjustedHeight;
- const size_t widthBmp = m_bmpChecked.GetWidth();
+ const int widthBmp = m_bmpChecked.GetWidth();
if ( IsOwnerDrawn() )
{
// widen the margin to fit the bitmap if necessary
- if ((size_t)GetMarginWidth() < widthBmp)
+ if ( GetMarginWidth() < widthBmp )
SetMarginWidth(widthBmp);
}
else // we must allocate enough space for the bitmap
// add a 4-pixel separator, otherwise menus look cluttered
*pwidth += 4;
+ // notice that this adjustment must be done after (possibly) changing the
+ // margin width above
+ if ( IsOwnerDrawn() )
+ {
+ // 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;
+ }
+
// make sure that this item is at least as tall as the system menu height
- const size_t heightStd = wxMSWSystemMenuFontModule::ms_systemMenuHeight;
+ const size_t heightStd = wxMSWSystemMenuFontModule::GetSystemMenuHeight();
if ( *pheight < heightStd )
*pheight = heightStd;
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
}
+// ----------------------------------------------------------------------------
+// global helper functions implemented here
+// ----------------------------------------------------------------------------
+
+BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState)
+{
+ // determine size of bitmap image
+ BITMAP bmp;
+ if ( !::GetObject(hBitmap, sizeof(BITMAP), &bmp) )
+ return FALSE;
+
+ BOOL result;
+
+ switch ( uState )
+ {
+ case wxDSB_NORMAL:
+ case wxDSB_SELECTED:
+ {
+ // uses image list functions to draw
+ // - normal bitmap with support transparency
+ // (image list internally create mask etc.)
+ // - blend bitmap with the background colour
+ // (like default selected items)
+ HIMAGELIST hIml = ::ImageList_Create(bmp.bmWidth, bmp.bmHeight,
+ ILC_COLOR32 | ILC_MASK, 1, 1);
+ ::ImageList_Add(hIml, hBitmap, NULL);
+ UINT fStyle = uState == wxDSB_SELECTED ? ILD_SELECTED : ILD_NORMAL;
+ result = ::ImageList_Draw(hIml, 0, hDC, x, y, fStyle);
+ ::ImageList_Destroy(hIml);
+ }
+ break;
+
+ case wxDSB_DISABLED:
+ result = ::DrawState(hDC, NULL, NULL, (LPARAM)hBitmap, 0, x, y,
+ bmp.bmWidth, bmp.bmHeight,
+ DST_BITMAP | DSS_DISABLED);
+ break;
+
+ default:
+ wxFAIL_MSG( _T("DrawStateBitmap: unknown wxDSBStates value") );
+ result = FALSE;
+ }
+
+ return result;
+}
+
#endif // wxUSE_OWNER_DRAWN
projects / wxWidgets.git / blobdiff