X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad7f3189f3240efe5f374516ffa7a0ae70700286..5875d39c9ba19f518e691792524f2fd03261c825:/src/os2/ownerdrw.cpp diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp index e5c4065ef4..ac75b71f40 100644 --- a/src/os2/ownerdrw.cpp +++ b/src/os2/ownerdrw.cpp @@ -6,19 +6,15 @@ // Created: 10/12/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/window.h" - #include "wx/msw/private.h" + #include "wx/os2/private.h" #include "wx/font.h" #include "wx/bitmap.h" #include "wx/dcmemory.h" @@ -28,6 +24,7 @@ #if wxUSE_OWNER_DRAWN +#include "wx/settings.h" #include "wx/ownerdrw.h" #include "wx/menuitem.h" @@ -40,11 +37,9 @@ // ctor // ---- // -wxOwnerDrawn::wxOwnerDrawn( - const wxString& rsStr -, bool bCheckable -, bool bMenuItem -) +wxOwnerDrawn::wxOwnerDrawn( const wxString& rsStr, + bool bCheckable, + bool WXUNUSED(bMenuItem) ) : m_strName(rsStr) { m_bCheckable = bCheckable; @@ -55,6 +50,8 @@ wxOwnerDrawn::wxOwnerDrawn( m_font = *wxNORMAL_FONT; } // end of wxOwnerDrawn::wxOwnerDrawn +wxOwnerDrawn::~wxOwnerDrawn() { } + size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15; size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth; @@ -64,40 +61,118 @@ size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth; // ------- // -bool wxOwnerDrawn::OnMeasureItem( - size_t* pWidth -, size_t* pHeight -) +bool wxOwnerDrawn::OnMeasureItem( size_t* pWidth, + size_t* pHeight ) { - wxMemoryDC vDC; + wxMemoryDC vDC; - vDC.SetFont(GetFont()); - - wxString sStr = wxStripMenuCodes(m_strName); + wxString sStr = wxStripMenuCodes(m_strName); + // + // If we have a valid accel string, then pad out + // the menu string so that the menu and accel string are not + // placed on top of each other. + if (!m_strAccel.empty() ) + { + sStr.Pad(sStr.Length()%8); + sStr += m_strAccel; + } + vDC.SetFont(GetFont()); vDC.GetTextExtent( sStr ,(long *)pWidth ,(long *)pHeight ); + if (!m_strAccel.empty()) + { + // + // Measure the accelerator string, and add its width to + // the total item width, plus 16 (Accelerators are right justified, + // with the right edge of the text rectangle 16 pixels left of + // the right edge of the menu) + // + int nAccelWidth; + int nAccelHeight; + + vDC.GetTextExtent( m_strAccel + ,&nAccelWidth + ,&nAccelHeight + ); + *pWidth += nAccelWidth; + } + + // + // 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 = (size_t)(*pWidth + GetDefaultMarginWidth() * 1.5); + + // + // JACS: items still look too tightly packed, so adding 5 pixels. + // + (*pHeight) += 5; + + // + // Ray Gilbert's changes - Corrects the problem of a BMP + // being placed next to text in a menu item, and the BMP does + // not match the size expected by the system. This will + // resize the space so the BMP will fit. Without this, BMPs + // must be no larger or smaller than 16x16. + // + if (m_bmpChecked.Ok()) + { + // + // Is BMP height larger then text height? + // + size_t nAdjustedHeight = m_bmpChecked.GetHeight() + + wxSystemSettings::GetMetric(wxSYS_EDGE_Y); + if (*pHeight < nAdjustedHeight) + *pHeight = nAdjustedHeight; + + // + // Does BMP encroach on default check menu position? + // + size_t nAdjustedWidth = m_bmpChecked.GetWidth() + + (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2); + + // + // Do we need to widen margin to fit BMP? + // + if ((size_t)GetMarginWidth() < nAdjustedWidth) + SetMarginWidth(nAdjustedWidth); - (*pHeight) = (*pHeight) + 2; - m_nHeight = *pHeight; // remember height for use in OnDrawItem - return TRUE; + // + // Add the size of the bitmap to our total size... + // + *pWidth += GetMarginWidth(); + } + + // + // Add the size of the bitmap to our total size - even if we don't have + // a bitmap we leave room for one... + // + *pWidth += GetMarginWidth(); + + // + // Make sure that this item is at least as + // tall as the user's system settings specify + // + if (*pHeight < m_nMinHeight) + *pHeight = m_nMinHeight; + m_nHeight = *pHeight; // remember height for use in OnDrawItem + return true; } // end of wxOwnerDrawn::OnMeasureItem // draw the item -bool wxOwnerDrawn::OnDrawItem( - wxDC& rDC -, const wxRect& rRect -, wxODAction eAction -, wxODStatus eStatus -) +bool wxOwnerDrawn::OnDrawItem( wxDC& rDC, + const wxRect& rRect, + wxODAction eAction, + wxODStatus eStatus ) { // // We do nothing on focus change // if (eAction == wxODFocusChanged ) - return TRUE; + return true; // // Select the font and draw the text @@ -126,11 +201,11 @@ bool wxOwnerDrawn::OnDrawItem( } // - // Base on the status of the menu item pick the right colors + // Based on the status of the menu item, pick the right colors // if (eStatus & wxODSelected) { - wxColour vCol2("WHITE"); + wxColour vCol2(wxT("WHITE")); vColBack.Set( (unsigned char)0 ,(unsigned char)0 ,(unsigned char)160 @@ -162,7 +237,7 @@ bool wxOwnerDrawn::OnDrawItem( // Fall back to default colors if none explicitly specified // vRef = ::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENU // we are using gray for all our window backgrounds in wxWindows + ,SYSCLR_MENU // we are using gray for all our window backgrounds in wxWidgets ,0L ); vColBack.Set( GetRValue(vRef) @@ -207,24 +282,24 @@ bool wxOwnerDrawn::OnDrawItem( // // Unfortunately, unlike Win32, PM has no owner drawn specific text // drawing methods like ::DrawState that can cleanly handle accel - // pneumonics and deal, automatically, with various states, so we have + // mnemonics and deal, automatically, with various states, so we have // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn - // strings either. We cannot handle mneumonics either. We display - // it, though, in hopes we can figure it out some day. + // strings either. We cannot handle mnemonics either. We display + // them, though, in the hope we can figure them out some day. // // - // Display main text and accel text separately to allign better + // Display main text and accel text separately to align better // - wxString sTgt = "\t"; - wxString sFullString = m_strName; // need to save the original text - wxString sAccel; - size_t nIndex; - size_t nWidth; - size_t nCharWidth; - size_t nHeight; - bool bFoundMneumonic = FALSE; - bool bFoundAccel = FALSE; + wxString sTgt = wxT("\t"); + wxString sFullString = m_strName; // need to save the original text + wxString sAccel; + int nIndex; + size_t nWidth; + size_t nCharWidth; + size_t nHeight; + bool bFoundMnemonic = false; + bool bFoundAccel = false; // // Deal with the tab, extracting the Accel text @@ -232,32 +307,32 @@ bool wxOwnerDrawn::OnDrawItem( nIndex = sFullString.Find(sTgt.c_str()); if (nIndex != -1) { - bFoundAccel = TRUE; + bFoundAccel = true; sAccel = sFullString.Mid(nIndex + 1); sFullString.Remove(nIndex); } // - // Deal with the mneumonic character + // Deal with the mnemonic character // - sTgt = "~"; + sTgt = wxT("~"); nIndex = sFullString.Find(sTgt.c_str()); if (nIndex != -1) { - wxString sTmp = sFullString; + wxString sTmp = sFullString; - bFoundMneumonic = TRUE; + bFoundMnemonic = true; sTmp.Remove(nIndex); rDC.GetTextExtent( sTmp ,(long *)&nWidth ,(long *)&nHeight ); - sTmp = sFullString[nIndex + 1]; + sTmp = sFullString[(size_t)(nIndex + 1)]; rDC.GetTextExtent( sTmp ,(long *)&nCharWidth ,(long *)&nHeight ); - sFullString.Replace(sTgt.c_str(), "", TRUE); + sFullString.Replace(sTgt.c_str(), wxEmptyString, true); } // @@ -269,10 +344,10 @@ bool wxOwnerDrawn::OnDrawItem( ,sFullString.length() ,(PCH)sFullString.c_str() ); - if (bFoundMneumonic) + if (bFoundMnemonic) { // - // Underline the mneumonic -- still won't work, but at least it "looks" right + // Underline the mnemonic -- still won't work, but at least it "looks" right // wxPen vPen; POINTL vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide @@ -340,7 +415,7 @@ bool wxOwnerDrawn::OnDrawItem( // // For uncheckable item we use only the 'checked' bitmap // - wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE)); + wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE)); if (vBmp.Ok()) { @@ -365,29 +440,24 @@ bool wxOwnerDrawn::OnDrawItem( // wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height)); - // - //MT: blit with mask enabled. - // + int nHeightDiff = m_nHeight - nBmpHeight; + rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2 - ,rRect.y + (m_nHeight - nBmpHeight) /2 + ,rRect.y + nHeightDiff / 2 ,nBmpWidth ,nBmpHeight ,&vDCMem ,0 ,0 ,wxCOPY - ,TRUE + ,true ); if (eStatus & wxODSelected) { - RECT vRectBmp = { rRect.x - ,rRect.y - ,rRect.x + GetMarginWidth() - ,rRect.y + m_nHeight - }; - POINTL vPnt1 = {2, 4}; // Leave a little background border + POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3}; + LINEBUNDLE vLine; vLine.lColor = vColBack.GetPixel(); @@ -408,7 +478,7 @@ bool wxOwnerDrawn::OnDrawItem( vBmp.SetSelectedInto(NULL); } } - return TRUE; + return true; } // end of wxOwnerDrawn::OnDrawItem #endif //wxUSE_OWNER_DRAWN