#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
}
private:
- static NONCLIENTMETRICS GetNCM()
- {
- WinStruct<NONCLIENTMETRICS> nm;
- if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) )
- {
-#if WINVER >= 0x0600
- // a new field has been added to NONCLIENTMETRICS under Vista, so
- // the call to SystemParametersInfo() fails if we use the struct
- // size incorporating this new value on an older system -- retry
- // without it
- nm.cbSize -= sizeof(int);
- if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) )
-#endif // WINVER >= 0x0600
- {
- // maybe we should initialize the struct with some defaults?
- wxLogLastError(_T("SystemParametersInfo(SPI_GETNONCLIENTMETRICS)"));
- }
- }
-
- return nm;
- }
-
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 = GetNCM().iMenuHeight - 4;
+ ms_systemMenuHeight = wxMSWImpl::GetNonClientMetrics().iMenuHeight - 4;
wxASSERT_MSG( ms_systemMenuHeight > 0,
"menu height should be positive" );
static void DoInitFont()
{
- ms_systemMenuFont = new wxFont(wxNativeFontInfo(GetNCM().lfMenuFont));
+ ms_systemMenuFont = new
+ wxFont(wxNativeFontInfo(wxMSWImpl::GetNonClientMetrics().lfMenuFont));
}
static wxFont* ms_systemMenuFont;
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::GetSystemMenuHeight();
if ( *pheight < heightStd )
// draw the item
bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
const wxRect& rc,
- wxODAction act,
+ wxODAction,
wxODStatus st)
{
- // we do nothing on focus change
- if ( act == wxODFocusChanged )
- return true;
-
-
// this flag determines whether or not an edge will
// be drawn around the bitmap. In most "windows classic"
// applications, a 1-pixel highlight edge is drawn around
AutoHBRUSH hbr(colBack);
SelectInHDC selBrush(hdc, hbr);
- RECT rectFill = { rc.GetLeft(), rc.GetTop(),
- rc.GetRight() + 1, rc.GetBottom() + 1 };
+ RECT rectFill;
+ wxCopyRectToRECT(rc, rectFill);
if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge )
{
(LPARAM)strMenuText.wx_str(),
strMenuText.length(),
xText,
- rc.y + (rc.GetHeight() - sizeRect.cy + 1)/2, // centre vertically
+ rc.y + (rc.height - sizeRect.cy) / 2, // centre vertically
rc.GetWidth() - margin,
sizeRect.cy,
flags
::DrawState(hdc, NULL, NULL,
(LPARAM)m_strAccel.wx_str(),
m_strAccel.length(),
- rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
+ rc.width - 16 - accel_width, rc.y + (rc.height - sizeRect.cy) / 2,
0, 0,
DST_TEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
}
+// ----------------------------------------------------------------------------
+// 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( wxT("DrawStateBitmap: unknown wxDSBStates value") );
+ result = FALSE;
+ }
+
+ return result;
+}
+
#endif // wxUSE_OWNER_DRAWN
projects / wxWidgets.git / blobdiff