X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7527e3f2178b3a527c50ffda6bb059f8ff8acce..6e18ca6cf434f1bd7245a3bf03d5a9cfe41393b6:/src/msw/ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index d60bc8c408..dc65344eef 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+#include "wx/msw/private.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
@@ -22,7 +23,7 @@
 
 #ifndef WX_PRECOMP
   #include "wx/window.h"
-  #include "wx/msw/private.h"
+//  #include "wx/msw/private.h"
   #include "wx/font.h"
   #include "wx/bitmap.h"
   #include "wx/dcmemory.h"
@@ -30,9 +31,12 @@
   #include "wx/utils.h"
 #endif
 
+#include "wx/settings.h"
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 
+#if wxUSE_OWNER_DRAWN
+
 
 // ============================================================================
 // implementation of wxOwnerDrawn class
@@ -48,6 +52,8 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
   m_bOwnerDrawn  = FALSE;
   m_nHeight      = 0;
   m_nMarginWidth = ms_nLastMarginWidth;
+  if (wxNORMAL_FONT)
+    m_font = * wxNORMAL_FONT;
 }
 
 #if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
@@ -65,22 +71,44 @@ size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
 bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 {
   wxMemoryDC dc;
-  dc.SetFont(GetFont());
 
-  // ## ugly...
-  wxChar *szStripped = new wxChar[m_strName.Len()];
-  wxStripMenuCodes((wxChar *)m_strName.c_str(), szStripped);
-  wxString str = szStripped;
-  delete [] szStripped;
+  wxString str = wxStripMenuCodes(m_strName);
 
   // # without this menu items look too tightly packed (at least under Windows)
-  str += _T('W'); // 'W' is typically the widest letter
+  str += wxT('W'); // 'W' is typically the widest letter
+
+  if (m_font.Ok())
+      dc.SetFont(GetFont());
 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
 
   // JACS: items still look too tightly packed, so adding 2 pixels.
   (*pheight) = (*pheight) + 2;
 
+  // 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 adjustedHeight = m_bmpChecked.GetHeight() +
+                              wxSystemSettings::GetSystemMetric(wxSYS_EDGE_Y);
+      if (*pheight < adjustedHeight)
+          *pheight = adjustedHeight;
+      
+      // Does BMP encroach on default check menu position?
+      size_t adjustedWidth = m_bmpChecked.GetWidth() +
+                             (wxSystemSettings::GetSystemMetric(wxSYS_EDGE_X) * 2);
+      if (ms_nDefaultMarginWidth < adjustedWidth)
+          *pwidth += adjustedWidth - ms_nDefaultMarginWidth;
+      
+      // Do we need to widen margin to fit BMP?
+      if ((size_t)GetMarginWidth() < adjustedWidth)
+          SetMarginWidth(adjustedWidth);
+  }
+  
   m_nHeight = *pheight;                // remember height for use in OnDrawItem
 
   return TRUE;
@@ -140,12 +168,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() ) {
@@ -186,14 +216,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 };
+      if ( m_nHeight > 0 )
+      {
 #ifndef __SC__
-      DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
+        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");
@@ -214,10 +249,15 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       // there should be enough place!
       wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
 
+      int heightDiff = (m_nHeight - nBmpHeight);
+//      if (heightDiff = -1)
+//        heightDiff = -2;
+
+      //MT: blit with mask enabled.
       dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, 
-              rc.y + (m_nHeight - nBmpHeight) /2, 
+              rc.y + heightDiff / 2, 
               nBmpWidth, nBmpHeight, 
-              &dcMem, 0, 0, wxCOPY);
+              &dcMem, 0, 0, wxCOPY, TRUE);
 
       if ( st & wxODSelected ) {
         #ifdef  O_DRAW_NATIVE_API
@@ -243,3 +283,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
   return TRUE;
 }
 
+
+#endif // wxUSE_OWNER_DRAWN
+