From 1159a76f9c57ad1254d887722689ed9d0d01d6c4 Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Fri, 23 Mar 2001 23:30:11 +0000
Subject: [PATCH] Ownerdrawn updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/os2/dcmemory.cpp |  1 +
 src/os2/ownerdrw.cpp | 20 +++++---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index a0aeef01b2..d303b5aa02 100644
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -144,6 +144,7 @@ wxMemoryDC::wxMemoryDC(
 
 wxMemoryDC::~wxMemoryDC()
 {
+    m_vSelectedBitmap.SetSelectedInto(NULL);
     if (m_hPS != NULLHANDLE)
         ::GpiDestroyPS(m_hPS);
     if (m_hDC != NULLHANDLE)
diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 1f58781ed9..46a4560cf4 100644
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -75,18 +75,6 @@ bool wxOwnerDrawn::OnMeasureItem(
 
     wxString                        sStr = wxStripMenuCodes(m_strName);
 
-#if 0
-    wxString                        sTgt = "\t";
-    size_t                          nIndex;
-
-    nIndex = sStr.Find(sTgt.c_str());
-    if (nIndex != -1)
-        sStr.Remove(nIndex);
-    sTgt = "~";
-    nIndex = sStr.Find(sTgt.c_str());
-    if (nIndex != -1)
-        sStr.Replace(sTgt.c_str(), "", TRUE);
-#endif
     vDC.GetTextExtent( sStr
                       ,(long *)pWidth
                       ,(long *)pHeight
@@ -122,7 +110,6 @@ bool wxOwnerDrawn::OnDrawItem(
     wxColour                        vColText;
     COLORREF                        vRef;
     RECTL                           vRect = {rRect.x + 4, rRect.y + 1, rRect.x + (rRect.width - 2), rRect.y + rRect.height};
-    char                            zMsg[128];
 
     //
     // Use default font if no font set
@@ -315,7 +302,7 @@ bool wxOwnerDrawn::OnDrawItem(
             vRect.xLeft   = rRect.x;
             vRect.xRight  = rRect.x + GetMarginWidth();
             vRect.yBottom = rRect.y;
-            vRect.yTop    = rRect.y + m_nHeight;
+            vRect.yTop    = rRect.y + m_nHeight - 3;
 
             ::WinDrawBitmap( hPS             // PS for this menuitem
                             ,hBmpCheck       // system checkmark
@@ -372,6 +359,8 @@ bool wxOwnerDrawn::OnDrawItem(
                                                 ,rRect.x + GetMarginWidth()
                                                 ,rRect.y + m_nHeight
                                                };
+                POINTL              vPnt1 = {2, 4}; // Leave a little background border
+                POINTL              vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3};
                 LINEBUNDLE          vLine;
 
                 vLine.lColor = vColBack.GetPixel();
@@ -381,9 +370,10 @@ bool wxOwnerDrawn::OnDrawItem(
                               ,0
                               ,&vLine
                              );
+                ::GpiMove(hPS, &vPnt1);
                 ::GpiBox( hPS
                          ,DRO_OUTLINE
-                         ,(PPOINTL)&vRectBmp
+                         ,&vPnt2
                          ,0L
                          ,0L
                         );
-- 
2.45.2