X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fc3eebc017183cb8cc2c4400227d05b4eb16676..ec46fd5fce4fd1993c341d1b720db04b4521e22d:/src/os2/menuitem.cpp diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 2a5f378584..3b5ff83d76 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -58,8 +58,6 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) - // ---------------------------------------------------------------------------- // wxMenuItem // ---------------------------------------------------------------------------- @@ -82,11 +80,6 @@ wxMenuItem::wxMenuItem( ,eKind ,pSubMenu ) -#if wxUSE_OWNER_DRAWN -, wxOwnerDrawn( wxPMTextToLabel(rsText) - ,eKind == wxITEM_CHECK - ) -#endif // owner drawn { wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); @@ -110,11 +103,6 @@ wxMenuItem::wxMenuItem( ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL ,pSubMenu ) -#if wxUSE_OWNER_DRAWN -, wxOwnerDrawn( wxPMTextToLabel(rsText) - ,bIsCheckable - ) -#endif // owner drawn { wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); @@ -132,21 +120,13 @@ void wxMenuItem::Init() // // Set default menu colors // - #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c)) - - SetTextColour(SYS_COLOR(MENUTEXT)); - SetBackgroundColour(SYS_COLOR(MENU)); + SetTextColour(wxNullColour); + SetBackgroundColour(wxNullColour); // // We don't want normal items be owner-drawn // - ResetOwnerDrawn(); - #undef SYS_COLOR - - // - // Tell the owner drawing code to to show the accel string as well - // - SetAccelString(m_text.AfterFirst(_T('\t'))); + SetOwnerDrawn(false); #endif // wxUSE_OWNER_DRAWN } // end of wxMenuItem::Init @@ -180,7 +160,7 @@ bool wxMenuItem::IsChecked() const return (uFlag & MIA_CHECKED) == MIA_CHECKED ; } // end of wxMenuItem::IsChecked -wxString wxMenuItemBase::GetLabelFromText( +wxString wxMenuItemBase::GetLabelText( const wxString& rsText ) { @@ -199,7 +179,7 @@ wxString wxMenuItemBase::GetLabelFromText( sLabel += *zPc; } return sLabel; -} // end of wxMenuItemBase::GetLabelFromText +} // end of wxMenuItemBase::GetLabelText // // Radio group stuff @@ -215,7 +195,7 @@ void wxMenuItem::SetRadioGroupStart( ) { wxASSERT_MSG( !m_bIsRadioGroupStart - ,_T("should only be called for the next radio items") + ,wxT("should only be called for the next radio items") ); m_vRadioGroup.m_nStart = nStart; @@ -226,7 +206,7 @@ void wxMenuItem::SetRadioGroupEnd( ) { wxASSERT_MSG( m_bIsRadioGroupStart - ,_T("should only be called for the first radio item") + ,wxT("should only be called for the first radio item") ); m_vRadioGroup.m_nEnd = nEnd; } // end of wxMenuItem::SetRadioGroupEnd @@ -288,7 +268,7 @@ void wxMenuItem::Check( int nPos = rItems.IndexOf(this); wxCHECK_RET( nPos != wxNOT_FOUND - ,_T("menuitem not found in the menu items list?") + ,wxT("menuitem not found in the menu items list?") ); // @@ -363,7 +343,7 @@ void wxMenuItem::Check( wxMenuItemBase::Check(bCheck); } // end of wxMenuItem::Check -void wxMenuItem::SetText( const wxString& rText ) +void wxMenuItem::SetItemLabel( const wxString& rText ) { // // Don't do anything if label didn't change @@ -373,22 +353,10 @@ void wxMenuItem::SetText( const wxString& rText ) if (m_text == sText) return; - if (sText.IsEmpty()) - { - wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?")); - sText = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC); - } + // wxMenuItemBase will do stock ID checks + wxMenuItemBase::SetItemLabel(sText); - wxMenuItemBase::SetText(sText); - OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText)); -#if wxUSE_OWNER_DRAWN - if (rText.IsEmpty()) - SetAccelString(sText.AfterFirst(_T('\t'))); - else - SetAccelString(rText.AfterFirst(_T('\t'))); -#endif // wxUSE_OWNER_DRAWN - - HWND hMenu = GetHmenuOf(m_parentMenu); + HWND hMenu = GetHmenuOf(m_parentMenu); wxCHECK_RET(hMenu, wxT("menuitem without menu")); @@ -416,19 +384,19 @@ void wxMenuItem::SetText( const wxString& rText ) uFlagsOld |= MIS_SUBMENU; } - BYTE* pData; + char* pData; #if wxUSE_OWNER_DRAWN if (IsOwnerDrawn()) { uFlagsOld |= MIS_OWNERDRAW; - pData = (BYTE*)this; + pData = (char*)this; } else #endif //owner drawn { uFlagsOld |= MIS_TEXT; - pData = (BYTE*)sText.c_str(); + pData = (char*) m_text.wx_str(); } // @@ -457,13 +425,370 @@ void wxMenuItem::SetText( const wxString& rText ) } } // end of wxMenuItem::SetText -void wxMenuItem::SetCheckable( - bool bCheckable -) +#if wxUSE_OWNER_DRAWN + +wxString wxMenuItem::GetName() const +{ + return GetItemLabelText(); +} + +bool wxMenuItem::OnMeasureItem( size_t* pWidth, size_t* pHeight ) { - wxMenuItemBase::SetCheckable(bCheckable); - OWNER_DRAWN_ONLY(wxOwnerDrawn::SetCheckable(bCheckable)); -} // end of wxMenuItem::SetCheckable + wxMemoryDC vDC; + + wxString sStr = GetName(); + + // + // 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. + wxString accel = GetItemLabel().AfterFirst(wxT('\t')); + if (!accel.empty() ) + { + sStr.Pad(sStr.length()%8); + sStr += accel; + } + vDC.SetFont(GetFont()); + vDC.GetTextExtent( sStr + ,(wxCoord *)pWidth + ,(wxCoord *)pHeight + ); + if (!accel.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); + + // + // 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 + // + const size_t heightStd = 6; // FIXME: get value from the system + if ( *pHeight < heightStd ) + *pHeight = heightStd; + m_nHeight = *pHeight; // remember height for use in OnDrawItem + return true; +} // end of wxOwnerDrawn::OnMeasureItem + +bool wxMenuItem::OnDrawItem( wxDC& rDC, + const wxRect& rRect, + wxODAction eAction, + wxODStatus eStatus ) +{ + + // + // Select the font and draw the text + // --------------------------------- + // + + CHARBUNDLE vCbnd; + wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); + HPS hPS= impl->GetHPS(); + wxFont vFont; + wxColour vColBack; + wxColour vColText; + COLORREF vRef; + RECTL vRect = {rRect.x + 4, rRect.y + 1, rRect.x + (rRect.width - 2), rRect.y + rRect.height}; + + memset(&vCbnd, 0, sizeof(CHARBUNDLE)); + + GetFontToUse(vFont); + GetColourToUse(eStatus, vColText, vColBack); + + rDC.SetFont(vFont); + rDC.SetTextBackground(vColBack); + rDC.SetTextForeground(vColText); + rDC.SetBackgroundMode(wxTRANSPARENT); + + vCbnd.lColor = vColText.GetPixel(); + vCbnd.lBackColor = vColBack.GetPixel(); + ::GpiSetAttrs( hPS + ,PRIM_CHAR + ,CBB_BACK_COLOR | CBB_COLOR + ,0 + ,&vCbnd + ); + ::GpiSetBackMix( hPS + ,BM_LEAVEALONE + ); + + // + // Paint the background + // + ::WinFillRect(hPS, &vRect, vColBack.GetPixel()); + + // + // Determine where to draw and leave space for a check-mark. + // + int nX = rRect.x + GetMarginWidth(); + + // + // Unfortunately, unlike Win32, PM has no owner drawn specific text + // drawing methods like ::DrawState that can cleanly handle accel + // 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 mnemonics either. We display + // them, though, in the hope we can figure them out some day. + // + + // + // Display main text and accel text separately to align better + // + wxString sTgt = wxT("\t"); + wxString sFullString = GetItemLabel(); // 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 + // + nIndex = sFullString.Find(sTgt); + if (nIndex != -1) + { + bFoundAccel = true; + sAccel = sFullString.Mid(nIndex + 1); + sFullString.Remove(nIndex); + } + + // + // Deal with the mnemonic character + // + sTgt = wxT("~"); + nIndex = sFullString.Find(sTgt); + if (nIndex != -1) + { + wxString sTmp = sFullString; + + bFoundMnemonic = true; + sTmp.Remove(nIndex); + rDC.GetTextExtent( sTmp + ,(wxCoord *)&nWidth + ,(wxCoord *)&nHeight + ); + sTmp = sFullString[(size_t)(nIndex + 1)]; + rDC.GetTextExtent( sTmp + ,(wxCoord *)&nCharWidth + ,(wxCoord *)&nHeight + ); + sFullString.Replace(sTgt.c_str(), wxEmptyString, true); + } + + // + // Draw the main item text sans the accel text + // + POINTL vPntStart = {nX, rRect.y + 4}; + ::GpiCharStringAt( impl->GetHPS() + ,&vPntStart + ,sFullString.length() + ,sFullString.char_str() + ); + if (bFoundMnemonic) + { + // + // 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 + + vPntStart.x = nX + nWidth - 1; + vPntStart.y = rRect.y + 2; // Make it look pretty! + vPen = wxPen(vColText, 1, wxSOLID); // Assuming we are always black + rDC.SetPen(vPen); + ::GpiMove(hPS, &vPntStart); + ::GpiLine(hPS, &vPntEnd); + } + + // + // Now draw the accel text + // + if (bFoundAccel) + { + size_t nWidth; + size_t nHeight; + + rDC.GetTextExtent( sAccel + ,(wxCoord *)&nWidth + ,(wxCoord *)&nHeight + ); + // + // Back off the starting position from the right edge + // + vPntStart.x = rRect.width - (nWidth + 7); + vPntStart.y = rRect.y + 4; + ::GpiCharStringAt( impl->GetHPS() + ,&vPntStart + ,sAccel.length() + ,sAccel.char_str() + ); + } + + // + // Draw the bitmap + // --------------- + // + if (IsCheckable() && !m_bmpChecked.Ok()) + { + if (eStatus & wxODChecked) + { + RECTL vRect; + HBITMAP hBmpCheck = ::WinGetSysBitmap(HWND_DESKTOP, SBMP_MENUCHECK); + + vRect.xLeft = rRect.x; + vRect.xRight = rRect.x + GetMarginWidth(); + vRect.yBottom = rRect.y; + vRect.yTop = rRect.y + m_nHeight - 3; + + ::WinDrawBitmap( hPS // PS for this menuitem + ,hBmpCheck // system checkmark + ,NULL // draw the whole bitmap + ,(PPOINTL)&vRect // destination -- bottom left corner of the menuitem area + ,0L // ignored + ,0L // draw a bitmap + ,DBM_NORMAL // draw normal size + ); + } + } + else + { + // + // For uncheckable item we use only the 'checked' bitmap + // + wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE)); + + if (vBmp.Ok()) + { + + wxMemoryDC vDCMem(&rDC); + wxMemoryDC* pOldDC = (wxMemoryDC*)vBmp.GetSelectedInto(); + + if(pOldDC != NULL) + { + vBmp.SetSelectedInto(NULL); + } + vDCMem.SelectObject(vBmp); + + // + // Center bitmap + // + int nBmpWidth = vBmp.GetWidth(); + int nBmpHeight = vBmp.GetHeight(); + + // + // There should be enough space! + // + wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height)); + + int nHeightDiff = m_nHeight - nBmpHeight; + + rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2 + ,rRect.y + nHeightDiff / 2 + ,nBmpWidth + ,nBmpHeight + ,&vDCMem + ,0 + ,0 + ,wxCOPY + ,true + ); + + if (eStatus & wxODSelected) + { + 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(); + ::GpiSetAttrs( hPS + ,PRIM_LINE + ,LBB_COLOR + ,0 + ,&vLine + ); + ::GpiMove(hPS, &vPnt1); + ::GpiBox( hPS + ,DRO_OUTLINE + ,&vPnt2 + ,0L + ,0L + ); + } + vBmp.SetSelectedInto(NULL); + } + } + return true; +} // end of wxOwnerDrawn::OnDrawItem + +#endif // wxUSE_OWNER_DRAWN // ---------------------------------------------------------------------------- // wxMenuItemBase