X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4049cc1ccd90f94ac97ce65357bd71a8162ecafb..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/os2/ownerdrw.cpp diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp index c0fbe632fd..eb7caf39de 100644 --- a/src/os2/ownerdrw.cpp +++ b/src/os2/ownerdrw.cpp @@ -1,318 +1,153 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/ownerdrw.cpp +// Name: src/os2/ownerdrw.cpp // Purpose: implementation of wxOwnerDrawn class // Author: David Webster -// Modified by: +// Modified by: Marcin Malich // 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/font.h" - #include "wx/bitmap.h" - #include "wx/dcmemory.h" - #include "wx/menu.h" - #include "wx/utils.h" -#endif - #if wxUSE_OWNER_DRAWN #include "wx/ownerdrw.h" -#include "wx/menuitem.h" +#include "wx/os2/private.h" +#include "wx/os2/dcclient.h" + +// ---------------------------------------------------------------------------- +// constants for base class +// ---------------------------------------------------------------------------- +int wxOwnerDrawnBase::ms_defaultMargin = 3; // ============================================================================ // implementation of wxOwnerDrawn class // ============================================================================ -// -// ctor -// ---- -// -wxOwnerDrawn::wxOwnerDrawn( - const wxString& rsStr -, bool bCheckable -, bool bMenuItem -) -: m_strName(rsStr) -{ - m_bCheckable = bCheckable; - m_bOwnerDrawn = FALSE; - m_nHeight = 0; - m_nMarginWidth = ms_nLastMarginWidth; - if (wxNORMAL_FONT) - m_font = *wxNORMAL_FONT; -} // end of wxOwnerDrawn::wxOwnerDrawn - -size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15; - -size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth; - -// -// Drawing -// ------- -// - -bool wxOwnerDrawn::OnMeasureItem( - size_t* pWidth -, size_t* pHeight -) +// draw the item +bool wxOwnerDrawn::OnDrawItem( wxDC& rDC, + const wxRect& rRect, + wxODAction eAction, + wxODStatus eStatus ) { - wxMemoryDC vDC; - - vDC.SetFont(GetFont()); - - wxString sStr = wxStripMenuCodes(m_strName); // - // # without this menu items look too tightly packed (at least under Windows) + // Select the font and draw the text + // --------------------------------- // - sStr += wxT('W'); // 'W' is typically the widest letter - vDC.GetTextExtent( sStr - ,(long *)pWidth - ,(long *)pHeight - ); - // DEBUG - char zMsg[128]; - sprintf(zMsg, "GetTextExtent for %s: Width: %ld, Height: %ld", m_strName.c_str(), *pWidth, *pHeight); - (void)wxMessageBox( "wxWindows Menu sample" - ,zMsg - ,wxICON_INFORMATION - ); - // end DEBUG - // - // 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; -} // end of wxOwnerDrawn::OnMeasureItem + 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}; -// searching for this macro you'll find all the code where I'm using the native -// Win32 GDI functions and not wxWindows ones. Might help to whoever decides to -// port this code to X. (VZ) + memset(&vCbnd, 0, sizeof(CHARBUNDLE)); -// 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? + GetFontToUse(vFont); + GetColourToUse(eStatus, vColText, vColBack); -// draw the item -bool wxOwnerDrawn::OnDrawItem( - wxDC& rDC -, const wxRect& rRect -, wxODAction eAction -, wxODStatus eStatus -) -{ - // - // For now we let PM deal with highlighting and framing and such in a - // default manner. So we leave fsAttribute and fsOldAttribute ( or - // fsState and fsOldState ) the same and pass it on. We may want to add - // code later to draw theseattributes in a more custom manner. - // - - // - // WxWinGdi_CColour <-> RGB - // - #define ToRGB(col) OS2RGB(col.Red(), col.Green(), col.Blue()) - #define UnRGB(col) GetRValue(col), GetGValue(col), GetBValue(col) - - CHARBUNDLE vCbndText; - CHARBUNDLE vCbndBack; - HPS hPS= rDC.GetHPS(); - ULONG lColBack; - ULONG lColText; - - if (eStatus & wxODSelected) - { - lColBack = (DWORD)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENUHILITEBGND // Light gray - ,0L - ); - lColText = (DWORD)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENUTEXT // Black - ,0L - ); - } - else if (eStatus & wxODDisabled) - { - lColBack = (DWORD)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENU // Light gray - ,0L - ); - lColText = (DWORD)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENUDISABLEDTEXT // dark gray - ,0L - ); - } - else - { - // - // Fall back to default colors if none explicitly specified - // - lColBack = m_colBack.Ok() ? ToRGB(m_colBack) : ::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENU // we are using gray for all our window backgrounds in wxWindows - ,0L - ); - lColText = m_colText.Ok() ? ToRGB(m_colText) : ::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_WINDOWTEXT // Black - ,0L - ); - } - vCbndText.lColor = (LONG)lColText; - vCbndBack.lColor = (LONG)lColBack; + 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_BACK_COLOR | CBB_COLOR ,0 - ,&vCbndBack + ,&vCbnd ); - ::GpiSetAttrs( hPS - ,PRIM_CHAR - ,CBB_COLOR - ,0 - ,&vCbndText - ); - - - // - // Determine where to draw and leave space for a check-mark. - // - int nX = rRect.x + GetMarginWidth(); + ::GpiSetBackMix( hPS + ,BM_LEAVEALONE + ); // - // Select the font and draw the text - // --------------------------------- + // Paint the background // + ::WinFillRect(hPS, &vRect, vColBack.GetPixel()); // - // Use default font if no font set + // Determine where to draw and leave space for a check-mark. // - if (m_font.Ok()) - { - m_font.RealizeResource(); - } - else - { - ::GpiSetCharSet(hPS, LCID_DEFAULT); - } + int nX = rRect.x + GetMarginWidth(); // // 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. + // strings either. We cannot handle mnemonics either. We display + // them, though, in the hope we can figure them out some day. + // - rDC.DrawText( m_strName - ,nX - ,rRect.y - ); + // + // Display main text + // + wxString sFullString = GetItemLabel(); // need to save the original text + int nIndex; + size_t nWidth; + size_t nCharWidth; + size_t nHeight; + bool bFoundMnemonic = false; // - // Draw the bitmap - // --------------- + // Deal with the mnemonic character // - if (IsCheckable() && !m_bmpChecked.Ok()) + nIndex = sFullString.Find(wxT("~")); + if (nIndex != -1) { - 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; - - ::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 - ); - } + 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); } - else + + // + // 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) { // - // For uncheckable item we use only the 'checked' bitmap + // Underline the mnemonic -- still won't work, but at least it "looks" right // - wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE)); - - if (vBmp.Ok()) - { - wxMemoryDC vDCMem(&rDC); - - 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)); - - // - //MT: blit with mask enabled. - // - rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2 - ,rRect.y + (m_nHeight - nBmpHeight) /2 - ,nBmpWidth - ,nBmpHeight - ,&vDCMem - ,0 - ,0 - ,wxCOPY - ,TRUE - ); - - if (eStatus & wxODSelected) - { - RECT vRectBmp = { rRect.x - ,rRect.y - ,rRect.x + GetMarginWidth() - ,rRect.y + m_nHeight - }; - LINEBUNDLE vLine; - - vLine.lColor = lColBack; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR - ,0 - ,&vLine - ); - ::GpiBox( hPS - ,DRO_OUTLINE - ,(PPOINTL)&vRectBmp - ,0L - ,0L - ); - } - } + 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); } - return TRUE; -} + return true; +} // end of wxOwnerDrawn::OnDrawItem #endif //wxUSE_OWNER_DRAWN