compilation fix (wxUniv/MSW)

[wxWidgets.git] / src / msw / ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index f8c26c035ede2b8afea7e4601808a14d64d9cb0a..1a01f87f3d7a69e9d4637b6b58ea11893834303f 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -2,7 +2,7 @@
 // Name:        msw/ownerdrw.cpp
 // Purpose:     implementation of wxOwnerDrawn class
 // Author:      Vadim Zeitlin
 // Name:        msw/ownerdrw.cpp
 // Purpose:     implementation of wxOwnerDrawn class
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#include "wx/msw/private.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -30,9 +31,12 @@
   #include "wx/utils.h"
 #endif
 
   #include "wx/utils.h"
 #endif
 

+#include "wx/settings.h"

 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 

+#if wxUSE_OWNER_DRAWN
+

 
 // ============================================================================
 // implementation of wxOwnerDrawn class
 
 // ============================================================================
 // implementation of wxOwnerDrawn class


@@ -40,14 +44,16 @@
 
 // ctor
 // ----
 
 // ctor
 // ----

-wxOwnerDrawn::wxOwnerDrawn(const wxString& str, 
-                           bool bCheckable, bool bMenuItem)
+wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
+                           bool bCheckable, bool WXUNUSED(bMenuItem))

             : m_strName(str)
 {
   m_bCheckable   = bCheckable;
   m_bOwnerDrawn  = FALSE;
   m_nHeight      = 0;
   m_nMarginWidth = ms_nLastMarginWidth;
             : m_strName(str)
 {
   m_bCheckable   = bCheckable;
   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)
 }
 
 #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;
 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 += wxT('W'); // 'W' is typically the widest letter
 
 
   // # without this menu items look too tightly packed (at least under Windows)
   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;
 
   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::GetMetric(wxSYS_EDGE_Y);
+      if (*pheight < adjustedHeight)
+          *pheight = adjustedHeight;
+
+      // Does BMP encroach on default check menu position?
+      size_t adjustedWidth = m_bmpChecked.GetWidth() +
+                             (wxSystemSettings::GetMetric(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;
   m_nHeight = *pheight;                // remember height for use in OnDrawItem
 
   return TRUE;


@@ -99,14 +127,17 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 #endif
 
 // draw the item
 #endif
 
 // draw the item

-bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus st)
+bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
+                              const wxRect& rc,
+                              wxODAction act,
+                              wxODStatus st)

 {
   // we do nothing on focus change
   if ( act == wxODFocusChanged )
     return TRUE;
 
   // wxColor <-> RGB
 {
   // we do nothing on focus change
   if ( act == wxODFocusChanged )
     return TRUE;
 
   // wxColor <-> RGB

-  #define   ToRGB(col)  RGB(col.Red(), col.Green(), col.Blue())
+  #define   ToRGB(col)  PALETTERGB(col.Red(), col.Green(), col.Blue())

   #define   UnRGB(col)  GetRValue(col), GetGValue(col), GetBValue(col)
 
   // set the colors
   #define   UnRGB(col)  GetRValue(col), GetGValue(col), GetBValue(col)
 
   // set the colors


@@ -121,7 +152,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
     colBack = m_colBack.Ok() ? ToRGB(m_colBack) : GetSysColor(COLOR_WINDOW);
     colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT);
   }
     colBack = m_colBack.Ok() ? ToRGB(m_colBack) : GetSysColor(COLOR_WINDOW);
     colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT);
   }

-        
+

   #ifdef  O_DRAW_NATIVE_API
     #define  hdc           (HDC)dc.GetHDC()
     COLORREF colOldText = ::SetTextColor(hdc, colText),
   #ifdef  O_DRAW_NATIVE_API
     #define  hdc           (HDC)dc.GetHDC()
     COLORREF colOldText = ::SetTextColor(hdc, colText),


@@ -134,10 +165,10 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
   // select the font and draw the text
   // ---------------------------------
 
   // select the font and draw the text
   // ---------------------------------
 

-  // determine where to draw and leave space for a check-mark. 
+  // determine where to draw and leave space for a check-mark.

   int x = rc.x + GetMarginWidth();
 
   int x = rc.x + GetMarginWidth();
 

-  // using native API because it reckognizes '&' 
+  // using native API because it reckognizes '&'

   #ifdef  O_DRAW_NATIVE_API
     int nPrevMode = SetBkMode(hdc, TRANSPARENT);
     HBRUSH hbr = CreateSolidBrush(colBack),
   #ifdef  O_DRAW_NATIVE_API
     int nPrevMode = SetBkMode(hdc, TRANSPARENT);
     HBRUSH hbr = CreateSolidBrush(colBack),


@@ -159,10 +190,23 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
     }
 
     HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
     }
 
     HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);

-    DrawState(hdc, NULL, NULL, 
-              (LPARAM)(const wxChar *)m_strName, m_strName.Length(), 
-              x, rc.y, rc.GetWidth(), rc.GetHeight(),
-              DST_PREFIXTEXT | ( st & wxODDisabled ? DSS_DISABLED : 0) );
+
+    ::DrawState(hdc, NULL, NULL,
+                (LPARAM)m_strName.c_str(), m_strName.length(),
+                x, rc.y, rc.GetWidth(), rc.GetHeight(),
+                DST_PREFIXTEXT | (st & wxODDisabled ? DSS_DISABLED : 0));
+
+    if ( !m_strAccel.empty() )
+    {
+        RECT r;
+        r.top = rc.GetTop();
+        r.left = rc.GetLeft();
+        r.right = rc.GetRight() - GetMarginWidth();
+        r.bottom = rc.GetBottom();
+
+        DrawText(hdc, m_strAccel, m_strAccel.length(), &r,
+                 DT_SINGLELINE | DT_RIGHT | DT_VCENTER);
+    }

 
     (void)SelectObject(hdc, hPrevBrush);
     (void)SelectObject(hdc, hPrevFont);
 
     (void)SelectObject(hdc, hPrevBrush);
     (void)SelectObject(hdc, hPrevFont);


@@ -178,7 +222,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
     if ( st & wxODChecked ) {
       // using native APIs for performance and simplicity
 #ifdef  O_DRAW_NATIVE_API
     if ( st & wxODChecked ) {
       // using native APIs for performance and simplicity
 #ifdef  O_DRAW_NATIVE_API

-      // what goes on: DrawFrameControl creates a b/w mask, 
+      // what goes on: DrawFrameControl creates a b/w mask,

       // then we copy it to screen to have right colors
 
         // first create a monochrome bitmap in a memory DC
       // then we copy it to screen to have right colors
 
         // first create a monochrome bitmap in a memory DC


@@ -190,13 +234,11 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
       if ( m_nHeight > 0 )
       {
       RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
       if ( m_nHeight > 0 )
       {

-#ifndef __SC__
-        DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
-#endif
+        ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);

       }
 
         // finally copy it to screen DC and clean up
       }
 
         // finally copy it to screen DC and clean up

-      BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, 
+      BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,

              hdcMem, 0, 0, SRCCOPY);
 
       DeleteDC(hdcMem);
              hdcMem, 0, 0, SRCCOPY);
 
       DeleteDC(hdcMem);


@@ -221,17 +263,22 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       // there should be enough place!
       wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
 
       // there should be enough place!
       wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
 

-      //MT: blit with mask enabled.
-      dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, 
-              rc.y + (m_nHeight - nBmpHeight) /2, 
-              nBmpWidth, nBmpHeight, 
-              &dcMem, 0, 0, wxCOPY, TRUE);
+      int heightDiff = m_nHeight - nBmpHeight;
+      dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2,
+              rc.y + heightDiff / 2,
+              nBmpWidth, nBmpHeight,
+              &dcMem, 0, 0, wxCOPY, TRUE /* use mask */);

 
       if ( st & wxODSelected ) {
         #ifdef  O_DRAW_NATIVE_API
 
       if ( st & wxODSelected ) {
         #ifdef  O_DRAW_NATIVE_API

-          RECT rectBmp = { rc.GetLeft(), rc.GetTop(), 
-                           rc.GetLeft() + GetMarginWidth(), 
-                           rc.GetTop() + m_nHeight };
+          RECT rectBmp =
+          {
+              rc.GetLeft(),
+              rc.GetTop(),
+              rc.GetLeft() + GetMarginWidth() - 1,
+              rc.GetTop() + m_nHeight - 1
+          };
+

           SetBkColor(hdc, colBack);
           DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT);
         #else
           SetBkColor(hdc, colBack);
           DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT);
         #else


@@ -251,3 +298,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
   return TRUE;
 }
 
   return TRUE;
 }
 

+
+#endif // wxUSE_OWNER_DRAWN
+