X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/810ca882569c59d537f75a982aaac0e218076bb0..4219d8b027a351fb6c2d1580c292e639bd322f77:/src/msw/ownerdrw.cpp?ds=inline diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 380a2fe5c6..3dfc9d0065 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/ownerdrw.cpp +// Name: src/msw/ownerdrw.cpp // Purpose: implementation of wxOwnerDrawn class // Author: Vadim Zeitlin // Modified by: @@ -9,79 +9,114 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/msw/private.h" #ifdef __BORLANDC__ -#pragma hdrstop + #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/dcmemory.h" - #include "wx/menu.h" - #include "wx/utils.h" + #include "wx/window.h" + #include "wx/font.h" + #include "wx/bitmap.h" + #include "wx/image.h" + #include "wx/dcmemory.h" + #include "wx/menu.h" + #include "wx/utils.h" + #include "wx/settings.h" + #include "wx/menuitem.h" + #include "wx/module.h" #endif -#include "wx/settings.h" #include "wx/ownerdrw.h" -#include "wx/menuitem.h" #include "wx/fontutil.h" -#include "wx/module.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) }; @@ -90,23 +125,33 @@ 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) -// temporary hack to implement wxOwnerDrawn::IsMenuItem() without breaking -// backwards compatibility -#if wxCHECK_VERSION(2, 7, 0) - #pragma warning "TODO: remove gs_menuItems hack" +// VC++ 6 gives a warning here: +// +// return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator:: +// operator ->' is 'class wxOwnerDrawn ** ' (ie; not a UDT or reference to +// a UDT. Will produce errors if applied using infix notation. +// +// shut it down +#if defined __VISUALC__ && __VISUALC__ <= 1300 + #if __VISUALC__ >= 1200 + #pragma warning(push) + #define POP_WARNINGS + #endif + #pragma warning(disable: 4284) #endif #include "wx/hashset.h" WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet); -static OwnerDrawnSet gs_menuItems; +#ifdef POP_WARNINGS + #pragma warning(pop) +#endif // ============================================================================ // implementation of wxOwnerDrawn class @@ -119,7 +164,7 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str, bool bMenuItem) : m_strName(str) { - if (ms_nDefaultMarginWidth == 0) + if ( ms_nDefaultMarginWidth == 0 ) { ms_nDefaultMarginWidth = ::GetSystemMetrics(SM_CXMENUCHECK) + wxSystemSettings::GetMetric(wxSYS_EDGE_X); @@ -128,34 +173,22 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str, m_bCheckable = bCheckable; m_bOwnerDrawn = false; + m_isMenuItem = bMenuItem; m_nHeight = 0; m_nMarginWidth = ms_nLastMarginWidth; - m_nMinHeight = wxMSWSystemMenuFontModule::ms_systemMenuHeight; - - m_bmpDisabled = wxNullBitmap; - - // TODO: we can't add new m_isMenuItem field in 2.6, so we use this hack - // with the map, but do add m_isMenuItem in 2.7 - if ( bMenuItem ) - { - gs_menuItems.insert(this); - } } wxOwnerDrawn::~wxOwnerDrawn() { - // TODO: remove this in 2.7 - gs_menuItems.erase(this); } bool wxOwnerDrawn::IsMenuItem() const { - // TODO: in 2.7, replace this with simple "return m_isMenuItem" - return gs_menuItems.count(this) == 1; + return m_isMenuItem; } -// 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; @@ -171,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; @@ -196,13 +229,16 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // placed on top of each other. if ( !m_strAccel.empty() ) { - str.Pad(str.Length()%8); + str.Pad(str.length()%8); str += m_strAccel; } dc.SetFont(GetFontToUse()); - dc.GetTextExtent(str, (long *)pwidth, (long *)pheight); + wxCoord w, h; + 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 @@ -217,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(); @@ -240,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; @@ -255,205 +291,245 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, wxODAction act, wxODStatus st) { - // we do nothing on focus change - if ( act == wxODFocusChanged ) - return true; + // 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 - // 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) + // 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; + bool draw_bitmap_edge = true; - // set the colors - // -------------- - DWORD colBack, colText; - if ( st & wxODSelected ) { - colBack = GetSysColor(COLOR_HIGHLIGHT); - if (!(st & wxODDisabled)) + // set the colors + // -------------- + DWORD colBack, colText; + if ( st & wxODSelected ) { - colText = GetSysColor(COLOR_HIGHLIGHTTEXT); + colBack = GetSysColor(COLOR_HIGHLIGHT); + if (!(st & wxODDisabled)) + { + colText = GetSysColor(COLOR_HIGHLIGHTTEXT); + } + else + { + colText = GetSysColor(COLOR_GRAYTEXT); + } } - else + else { - colText = GetSysColor(COLOR_GRAYTEXT); + // fall back to default colors if none explicitly specified + colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack) + : GetSysColor(COLOR_MENU); + colText = m_colText.Ok() ? wxColourToPalRGB(m_colText) + : GetSysColor(COLOR_MENUTEXT); } - } - else { - // fall back to default colors if none explicitly specified - colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack) - : GetSysColor(COLOR_MENU); - colText = m_colText.Ok() ? wxColourToPalRGB(m_colText) - : GetSysColor(COLOR_MENUTEXT); - } - - - // don't draw an edge around the bitmap, if background is white ... - 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; - } + if ( IsOwnerDrawn() ) + { + // don't draw an edge around the bitmap, if background is white ... + 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; + } + } + else // edge doesn't look well with default Windows drawing + { + draw_bitmap_edge = false; + } - HDC hdc = GetHdcOf(dc); - COLORREF colOldText = ::SetTextColor(hdc, colText), - colOldBack = ::SetBkColor(hdc, colBack); - // *2, as in wxSYS_EDGE_Y - int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X); + wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); + HDC hdc = GetHdcOf(*impl); + COLORREF colOldText = ::SetTextColor(hdc, colText), + colOldBack = ::SetBkColor(hdc, colBack); - // select the font and draw the text - // --------------------------------- + // *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. - // + 1 pixel to separate the edge from the highlight rectangle - int xText = rc.x + margin + 1; + // determine where to draw and leave space for a check-mark. + // + 1 pixel to separate the edge from the highlight rectangle + int xText = rc.x + margin + 1; - // using native API because it recognizes '&' - if ( IsOwnerDrawn() ) - { - int nPrevMode = SetBkMode(hdc, TRANSPARENT); - AutoHBRUSH hbr(colBack); - SelectInHDC selBrush(hdc, hbr); - RECT rectFill = { rc.GetLeft(), rc.GetTop(), - rc.GetRight() + 1, rc.GetBottom() + 1 }; + // using native API because it recognizes '&' + if ( IsOwnerDrawn() ) + { + int nPrevMode = SetBkMode(hdc, TRANSPARENT); + AutoHBRUSH hbr(colBack); + SelectInHDC selBrush(hdc, hbr); - 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; - } + RECT rectFill = { rc.GetLeft(), rc.GetTop(), + rc.GetRight() + 1, rc.GetBottom() + 1 }; - FillRect(hdc, &rectFill, hbr); + 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; + } - // use default font if no font set - wxFont fontToUse = GetFontToUse(); - SelectInHDC selFont(hdc, GetHfontOf(fontToUse)); + FillRect(hdc, &rectFill, hbr); - wxString strMenuText = m_strName.BeforeFirst('\t'); + // use default font if no font set + wxFont fontToUse = GetFontToUse(); + SelectInHDC selFont(hdc, GetHfontOf(fontToUse)); - xText += 3; // separate text from the highlight rectangle + wxString strMenuText = m_strName.BeforeFirst('\t'); - SIZE 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), // 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 + xText += 3; // separate text from the highlight rectangle - // ::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 - // to take care of right alignment ourselves. - if ( !m_strAccel.empty() ) - { - int accel_width, accel_height; - dc.GetTextExtent(m_strAccel, &accel_width, &accel_height); - // right align accel string with right edge of menu ( offset by the - // margin width ) - ::DrawState(hdc, NULL, NULL, - (LPARAM)m_strAccel.c_str(), m_strAccel.length(), - 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)); - } + SIZE sizeRect; + ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.length(), &sizeRect); - (void)SetBkMode(hdc, nPrevMode); - } + int flags = DST_PREFIXTEXT; + if ( (st & wxODDisabled) && !(st & wxODSelected) ) + flags |= DSS_DISABLED; + if ( (st & wxODHidePrefix) && + !wxMSWSystemMenuFontModule::AlwaysShowCues() ) + flags |= DSS_HIDEPREFIX; - // draw the bitmap - // --------------- - if ( IsCheckable() && !m_bmpChecked.Ok() ) { - if ( st & wxODChecked ) { - // what goes on: DrawFrameControl creates a b/w mask, - // then we copy it to screen to have right colors + ::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 + ); - // first create a monochrome bitmap in a memory DC - HDC hdcMem = CreateCompatibleDC(hdc); - HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0); - SelectObject(hdcMem, hbmpCheck); - - // then draw a check mark into it - RECT rect = { 0, 0, margin, m_nHeight }; - if ( m_nHeight > 0 ) - { - ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); - } - - // finally copy it to screen DC and clean up - BitBlt(hdc, rc.x, rc.y, margin, m_nHeight, - hdcMem, 0, 0, SRCCOPY); + // ::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 + // to take care of right alignment ourselves. + if ( !m_strAccel.empty() ) + { + int accel_width, accel_height; + dc.GetTextExtent(m_strAccel, &accel_width, &accel_height); + // right align accel string with right edge of menu ( offset by the + // margin width ) + ::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), + 0, 0, + DST_TEXT | + (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); + } - DeleteDC(hdcMem); - DeleteObject(hbmpCheck); + (void)SetBkMode(hdc, nPrevMode); } - } - else { - wxBitmap bmp; - if ( st & wxODDisabled ) - { - bmp = GetDisabledBitmap(); - } - if ( !bmp.Ok() ) + // draw the bitmap + // --------------- + if ( IsCheckable() && !m_bmpChecked.Ok() ) { - // for not checkable bitmaps we should always use unchecked one because - // their checked bitmap is not set - bmp = GetBitmap(!IsCheckable() || (st & wxODChecked)); + if ( st & wxODChecked ) + { + // what goes on: DrawFrameControl creates a b/w mask, + // then we copy it to screen to have right colors + + // first create a monochrome bitmap in a memory DC + HDC hdcMem = CreateCompatibleDC(hdc); + HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0); + SelectObject(hdcMem, hbmpCheck); + + // then draw a check mark into it + RECT rect = { 0, 0, margin, m_nHeight }; + if ( m_nHeight > 0 ) + { + ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); + } + + // finally copy it to screen DC and clean up + BitBlt(hdc, rc.x, rc.y, margin, m_nHeight, hdcMem, 0, 0, SRCCOPY); + + DeleteDC(hdcMem); + DeleteObject(hbmpCheck); + } } + else + { + wxBitmap bmp; - if ( bmp.Ok() ) { - wxMemoryDC dcMem(&dc); - dcMem.SelectObject(bmp); - - // center bitmap - int nBmpWidth = bmp.GetWidth(), - nBmpHeight = bmp.GetHeight(); - - // there should be enough space! - wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); - - int heightDiff = m_nHeight - nBmpHeight; - dc.Blit(rc.x + (margin - nBmpWidth) / 2, - rc.y + heightDiff / 2, - nBmpWidth, nBmpHeight, - &dcMem, 0, 0, wxCOPY, true /* use mask */); + if ( st & wxODDisabled ) + { + bmp = GetDisabledBitmap(); + } - if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge ) { - RECT rectBmp = { rc.GetLeft(), rc.GetTop(), - rc.GetLeft() + margin, - rc.GetTop() + m_nHeight }; - SetBkColor(hdc, colBack); + if ( !bmp.Ok() ) + { + // for not checkable bitmaps we should always use unchecked one + // because their checked bitmap is not set + bmp = GetBitmap(!IsCheckable() || (st & wxODChecked)); + +#if wxUSE_IMAGE + if ( bmp.Ok() && st & wxODDisabled ) + { + // we need to grey out the bitmap as we don't have any specific + // disabled bitmap + wxImage imgGrey = bmp.ConvertToImage().ConvertToGreyscale(); + if ( imgGrey.Ok() ) + bmp = wxBitmap(imgGrey); + } +#endif // wxUSE_IMAGE + } - DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT); - } + if ( bmp.Ok() ) + { + wxMemoryDC dcMem(&dc); + dcMem.SelectObjectAsSource(bmp); + + // center bitmap + int nBmpWidth = bmp.GetWidth(), + nBmpHeight = bmp.GetHeight(); + + // there should be enough space! + wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); + + int heightDiff = m_nHeight - nBmpHeight; + dc.Blit(rc.x + (margin - nBmpWidth) / 2, + rc.y + heightDiff / 2, + nBmpWidth, nBmpHeight, + &dcMem, 0, 0, wxCOPY, true /* use mask */); + + 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_RAISEDINNER, BF_RECT); + } + } } - } - ::SetTextColor(hdc, colOldText); - ::SetBkColor(hdc, colOldBack); + ::SetTextColor(hdc, colOldText); + ::SetBkColor(hdc, colOldBack); - return true; + return true; } #endif // wxUSE_OWNER_DRAWN -