cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 731656 ] Owner draw menu icons

Browse Source 
Benjamin I. Williams


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-05-21 19:07:02 +00:00
parent f3466c5537
commit c0cb30dc8f
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/msw/ownerdrw.cpp
View File

@ -225,10 +225,6 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
// Win32 GDI functions and not wxWindows ones. Might help to whoever decides to
// port this code to X. (VZ)
// JACS: TODO. Why does a disabled but highlighted item still
// get drawn embossed? How can we tell DrawState that we don't want the
// embossing?
#if defined(__WIN32__) && !defined(__SYMANTEC__) && !defined(__TWIN32__)
#define O_DRAW_NATIVE_API // comments below explain why I use it
#endif
@ -247,6 +243,18 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
#define ToRGB(col) PALETTERGB(col.Red(), col.Green(), col.Blue())
#define UnRGB(col) GetRValue(col), GetGValue(col), GetBValue(col)
// 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
// the bitmap of an item when it is selected. However,
// with the new "luna" theme, no edge is drawn around
// the bitmap because the background is white (this applies
// only to "non-XP style" menus w/ bitmaps --
// see IE 6 menus for an example)
bool draw_bitmap_edge = true;
// set the colors
// --------------
DWORD colBack, colText;
@ -267,6 +275,17 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT);
}
// if background is white, don't draw an edge around the bitmap
DWORD menu_bg_color = GetSysColor(COLOR_MENU);
if (GetRValue(menu_bg_color) >= 0xf0 &&
GetGValue(menu_bg_color) >= 0xf0 &&
GetBValue(menu_bg_color) >= 0xf0)
{
draw_bitmap_edge = false;
}
#ifdef O_DRAW_NATIVE_API
#define hdc (HDC)dc.GetHDC()
COLORREF colOldText = ::SetTextColor(hdc, colText),
@ -293,7 +312,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
RECT rectFill = { rc.GetLeft(), rc.GetTop(), rc.GetRight()+1, rc.GetBottom() };
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; leave a 1-pixel gap.
rectFill.left = GetMarginWidth() + 1;
@ -400,13 +419,13 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
nBmpWidth, nBmpHeight,
&dcMem, 0, 0, wxCOPY, TRUE /* use mask */);
if ( st & wxODSelected ) {
if ( st & wxODSelected && draw_bitmap_edge ) {
#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);
DrawEdge(hdc, &rectBmp, BDR_RAISEDOUTER, BF_SOFT | BF_RECT);
#else
int x1, y1, x2, y2;
x1 = rc.x;