X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e7c2aa5822f9a6e97d8d7848b95ea2eadcd98b..585266618c27ac77a5e5316c03e06ffc514715c9:/src/msw/ownerdrw.cpp?ds=inline diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 50d45ce921..f0f1223260 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -9,25 +9,34 @@ // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// headers & declarations -// ============================================================================ +#ifdef __GNUG__ +#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 #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" #endif +#include "wx/settings.h" #include "wx/ownerdrw.h" #include "wx/menuitem.h" -#include +#if wxUSE_OWNER_DRAWN + // ============================================================================ // implementation of wxOwnerDrawn class @@ -35,7 +44,7 @@ // ctor // ---- -wxOwnerDrawn::wxOwnerDrawn(const wxTString& str, +wxOwnerDrawn::wxOwnerDrawn(const wxString& str, bool bCheckable, bool bMenuItem) : m_strName(str) { @@ -43,35 +52,41 @@ wxOwnerDrawn::wxOwnerDrawn(const wxTString& str, m_bOwnerDrawn = FALSE; m_nHeight = 0; m_nMarginWidth = ms_nLastMarginWidth; + if (wxNORMAL_FONT) + m_font = * wxNORMAL_FONT; } -#if defined(__WXMSW__) && defined(__WIN32__) - uint wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK); +#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK) + size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK); #else // # what is the reasonable default? - uint wxOwnerDrawn::ms_nDefaultMarginWidth = 15; + size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15; #endif -uint wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth; +size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth; // drawing // ------- // get size of the item -bool wxOwnerDrawn::OnMeasureItem(uint *pwidth, uint *pheight) +bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) { wxMemoryDC dc; dc.SetFont(GetFont()); // ## ugly... - char *szStripped = new char[m_strName.Len()]; - wxStripMenuCodes((char *)m_strName.c_str(), szStripped); + wxChar *szStripped = new wxChar[m_strName.Len()]; + wxStripMenuCodes((wxChar *)m_strName.c_str(), szStripped); wxString str = szStripped; delete [] szStripped; // # without this menu items look too tightly packed (at least under Windows) - str += 'W'; // 'W' is typically the widest letter + str += wxT('W'); // 'W' is typically the widest letter dc.GetTextExtent(str, (long *)pwidth, (long *)pheight); + + // JACS: items still look too tightly packed, so adding 2 pixels. + (*pheight) = (*pheight) + 2; + m_nHeight = *pheight; // remember height for use in OnDrawItem return TRUE; @@ -81,7 +96,11 @@ bool wxOwnerDrawn::OnMeasureItem(uint *pwidth, uint *pheight) // Win32 GDI functions and not wxWindows ones. Might help to whoever decides to // port this code to X. (VZ) -#ifdef __WIN32__ +// 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(__SC__) && !defined(__TWIN32__) #define O_DRAW_NATIVE_API // comments below explain why I use it #endif @@ -127,12 +146,14 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // using native API because it reckognizes '&' #ifdef O_DRAW_NATIVE_API int nPrevMode = SetBkMode(hdc, TRANSPARENT); - HBRUSH hbr = CreateSolidBrush(colBack), - hPrevBrush = (HBRUSH) SelectObject(hdc, hbr); + HBRUSH hbr = CreateSolidBrush(colBack), + hPrevBrush = (HBRUSH)SelectObject(hdc, hbr); RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() }; FillRect(hdc, &rectAll, hbr); + DeleteObject(hbr); + // use default font if no font set HFONT hfont; if ( m_font.Ok() ) { @@ -145,7 +166,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont); DrawState(hdc, NULL, NULL, - (LPARAM)(const char *)m_strName, m_strName.Length(), + (LPARAM)(const wxChar *)m_strName, m_strName.Length(), x, rc.y, rc.GetWidth(), rc.GetHeight(), DST_PREFIXTEXT | ( st & wxODDisabled ? DSS_DISABLED : 0) ); @@ -173,12 +194,19 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // then draw a check mark into it RECT rect = { 0, 0, GetMarginWidth(), m_nHeight }; - DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); + if ( m_nHeight > 0 ) + { +#ifndef __SC__ + DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); +#endif + } // finally copy it to screen DC and clean up BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, hdcMem, 0, 0, SRCCOPY); + DeleteDC(hdcMem); + DeleteObject(hbmpCheck); #else // #### to do: perhaps using Marlett font (create equiv. font under X) // wxFAIL("not implemented"); @@ -199,10 +227,11 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt // there should be enough place! wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); + //MT: blit with mask enabled. dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, rc.y + (m_nHeight - nBmpHeight) /2, nBmpWidth, nBmpHeight, - &dcMem, 0, 0, wxCOPY); + &dcMem, 0, 0, wxCOPY, TRUE); if ( st & wxODSelected ) { #ifdef O_DRAW_NATIVE_API @@ -228,3 +257,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt return TRUE; } + +#endif // wxUSE_OWNER_DRAWN +