added DoSetNativeFontInfo() to avoid virtual function hiding

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 8334e32fe54112944f6f925de290464a516065e0..cc87619eef0aa8cebc0f430528c26b1677288b0f 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -98,20 +98,44 @@ size_t wxOwnerDrawn::ms_nLastMarginWidth = 0;
 // -------
 
 // get size of the item
 // -------
 
 // get size of the item

+// The item size includes the menu string, the accel string,
+// the bitmap and size for a submenu expansion arrow...

 bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 {
   wxMemoryDC dc;
 
   wxString str = wxStripMenuCodes(m_strName);
 
 bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 {
   wxMemoryDC dc;
 
   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
+  // if we have a valid accel string, then pad out
+  // the menu string so the menu and accel string are not
+  // placed ontop of eachother.
+  if ( !m_strAccel.empty() )
+   {
+       str.Pad(str.Length()%8);
+       str += m_strAccel;
+   }

 
   if (m_font.Ok())
       dc.SetFont(GetFont());
 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
 
 
   if (m_font.Ok())
       dc.SetFont(GetFont());
 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
 

+  if (!m_strAccel.IsEmpty())
+  {
+      // measure the accelerator string, and add it's 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 accel_width, accel_height;
+      dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
+      *pwidth += accel_width;
+  }
+
+  // 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) (GetDefaultMarginWidth() * 1.5);
+

   // JACS: items still look too tightly packed, so adding 5 pixels.
   (*pheight) = (*pheight) + 5;
 
   // JACS: items still look too tightly packed, so adding 5 pixels.
   (*pheight) = (*pheight) + 5;
 


@@ -131,14 +155,21 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
       // Does BMP encroach on default check menu position?
       size_t adjustedWidth = m_bmpChecked.GetWidth() +
                              (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2);
       // 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;
+//      if (ms_nDefaultMarginWidth < adjustedWidth)
+//          *pwidth += adjustedWidth - ms_nDefaultMarginWidth;

 
       // Do we need to widen margin to fit BMP?
 
       // Do we need to widen margin to fit BMP?

-      if ((size_t)GetMarginWidth() < adjustedWidth)
+      if ((size_t)GetMarginWidth() != adjustedWidth)

           SetMarginWidth(adjustedWidth);
           SetMarginWidth(adjustedWidth);

+        
+      // 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
   if (*pheight < m_nMinHeight)
   // make sure that this item is at least as
   // tall as the user's system settings specify
   if (*pheight < m_nMinHeight)


@@ -180,7 +211,14 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
   DWORD colBack, colText;
   if ( st & wxODSelected ) {
     colBack = GetSysColor(COLOR_HIGHLIGHT);
   DWORD colBack, colText;
   if ( st & wxODSelected ) {
     colBack = GetSysColor(COLOR_HIGHLIGHT);

-    colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+    if (!(st & wxODDisabled))
+    {
+        colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+    }
+     else
+    {
+        colText = GetSysColor(COLOR_GRAYTEXT);
+    }

   }
   else {
     // fall back to default colors if none explicitly specified
   }
   else {
     // fall back to default colors if none explicitly specified


@@ -222,8 +260,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
 
     FillRect(hdc, &rectFill, hbr);
 
 
     FillRect(hdc, &rectFill, hbr);
 

-    DeleteObject(hbr);
-

     // use default font if no font set
     HFONT hfont;
     if ( m_font.Ok() ) {
     // use default font if no font set
     HFONT hfont;
     if ( m_font.Ok() ) {


@@ -236,28 +272,35 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
 
     HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
 
 
     HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
 

-    wxString strStrippedName = wxStripMenuCodes(m_strName);
+    wxString strMenuText = m_strName.BeforeFirst('\t');

 
 

+    SIZE sizeRect;
+    GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect);

     ::DrawState(hdc, NULL, NULL,
     ::DrawState(hdc, NULL, NULL,

-                (LPARAM)strStrippedName.c_str(), strStrippedName.length(),
-                x, rc.y + 1, rc.GetWidth(), rc.GetHeight(),
-                DST_PREFIXTEXT | (st & wxODDisabled ? DSS_DISABLED : 0));
+                (LPARAM)strMenuText.c_str(), strMenuText.length(),
+                x, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically
+                rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
+                DST_PREFIXTEXT |
+                (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));

 
     if ( !m_strAccel.empty() )
     {
 
     if ( !m_strAccel.empty() )
     {

-        RECT r;
-        r.top = rc.GetTop() + 1;
-        r.left = rc.GetLeft();
-        r.right = rc.GetRight() - 16;
-        r.bottom = rc.GetBottom();
-
-        DrawText(hdc, m_strAccel, m_strAccel.length(), &r,
-                 DT_SINGLELINE | DT_RIGHT);
+        // right align accel string with right edge of menu ( offset by the margin width )
+        ::SetTextAlign(hdc, TA_RIGHT);
+        ::DrawState(hdc, NULL, NULL,
+                    (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
+                    rc.GetWidth()-(GetMarginWidth()), rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
+                    rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
+                    DST_TEXT |
+                    (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
+        ::SetTextAlign(hdc, TA_LEFT);

     }
 
     (void)SelectObject(hdc, hPrevBrush);
     (void)SelectObject(hdc, hPrevFont);
     (void)SetBkMode(hdc, nPrevMode);
     }
 
     (void)SelectObject(hdc, hPrevBrush);
     (void)SelectObject(hdc, hPrevFont);
     (void)SetBkMode(hdc, nPrevMode);

+
+    DeleteObject(hbr);

   #else
     dc.SetFont(GetFont());
     dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y);
   #else
     dc.SetFont(GetFont());
     dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y);


@@ -317,7 +360,13 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
               &dcMem, 0, 0, wxCOPY, TRUE /* use mask */);
 
       if ( st & wxODSelected ) {
               &dcMem, 0, 0, wxCOPY, TRUE /* use mask */);
 
       if ( st & wxODSelected ) {

-
+        #ifdef  O_DRAW_NATIVE_API
+          RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
+                           rc.GetLeft() + GetMarginWidth(),
+                           rc.GetTop() + m_nHeight-1 };
+          SetBkColor(hdc, colBack);
+          DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT);
+        #else

           int x1, y1, x2, y2;
           x1 = rc.x;
           y1 = rc.y;
           int x1, y1, x2, y2;
           x1 = rc.x;
           y1 = rc.y;


@@ -330,6 +379,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
           dc.SetPen(*wxGREY_PEN);
           dc.DrawLine(x1, y2-1, x2, y2-1);
           dc.DrawLine(x2, y1, x2, y2);
           dc.SetPen(*wxGREY_PEN);
           dc.DrawLine(x1, y2-1, x2, y2-1);
           dc.DrawLine(x2, y1, x2, y2);

+        #endif  //O_DRAW_NATIVE_API

       }
     }
   }
       }
     }
   }