Also update focus rect when changing selection in single selection mode, fixes #11332

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index b25513c6026f760fd310bec50aad4c1f9ec58b61..29467f8417987aa6a54d64fd74f23fdad683ea18 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -29,6 +29,7 @@
     #include "wx/settings.h"
     #include "wx/menuitem.h"
     #include "wx/module.h"
     #include "wx/settings.h"
     #include "wx/menuitem.h"
     #include "wx/module.h"

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

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


@@ -239,10 +240,6 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
         dc.GetTextExtent(str, &w, &h);
         *pwidth = w;
         *pheight = h;
         dc.GetTextExtent(str, &w, &h);
         *pwidth = w;
         *pheight = h;

-
-        // 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 += GetMarginWidth() + 16;

     }
     else // don't draw the text, just the bitmap (if any)
     {
     }
     else // don't draw the text, just the bitmap (if any)
     {


@@ -258,11 +255,11 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
         if ( *pheight < adjustedHeight )
             *pheight = adjustedHeight;
 
         if ( *pheight < adjustedHeight )
             *pheight = adjustedHeight;
 

-        const size_t widthBmp = m_bmpChecked.GetWidth();
+        const int widthBmp = m_bmpChecked.GetWidth();

         if ( IsOwnerDrawn() )
         {
             // widen the margin to fit the bitmap if necessary
         if ( IsOwnerDrawn() )
         {
             // widen the margin to fit the bitmap if necessary

-            if ((size_t)GetMarginWidth() < widthBmp)
+            if ( GetMarginWidth() < widthBmp )

                 SetMarginWidth(widthBmp);
         }
         else // we must allocate enough space for the bitmap
                 SetMarginWidth(widthBmp);
         }
         else // we must allocate enough space for the bitmap


@@ -274,6 +271,15 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
     // add a 4-pixel separator, otherwise menus look cluttered
     *pwidth += 4;
 
     // add a 4-pixel separator, otherwise menus look cluttered
     *pwidth += 4;
 

+    // notice that this adjustment must be done after (possibly) changing the
+    // margin width above
+    if ( IsOwnerDrawn() )
+    {
+        // 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 += GetMarginWidth() + 16;
+    }
+

     // make sure that this item is at least as tall as the system menu height
     const size_t heightStd = wxMSWSystemMenuFontModule::GetSystemMenuHeight();
     if ( *pheight < heightStd )
     // make sure that this item is at least as tall as the system menu height
     const size_t heightStd = wxMSWSystemMenuFontModule::GetSystemMenuHeight();
     if ( *pheight < heightStd )


@@ -288,14 +294,9 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 // draw the item
 bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
                               const wxRect& rc,
 // draw the item
 bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
                               const wxRect& rc,

-                              wxODAction act,
+                              wxODAction,

                               wxODStatus st)
 {
                               wxODStatus st)
 {

-    // we do nothing on focus change
-    if ( act == wxODFocusChanged )
-        return true;
-
-

     // this flag determines whether or not an edge will
     // be drawn around the bitmap. In most "windows classic"
     // applications, a 1-pixel highlight edge is drawn around
     // this flag determines whether or not an edge will
     // be drawn around the bitmap. In most "windows classic"
     // applications, a 1-pixel highlight edge is drawn around


@@ -373,8 +374,8 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
         AutoHBRUSH hbr(colBack);
         SelectInHDC selBrush(hdc, hbr);
 
         AutoHBRUSH hbr(colBack);
         SelectInHDC selBrush(hdc, hbr);
 

-        RECT rectFill = { rc.GetLeft(), rc.GetTop(),
-                            rc.GetRight() + 1, rc.GetBottom() + 1 };
+        RECT rectFill;
+        wxCopyRectToRECT(rc, rectFill);

 
         if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge )
         {
 
         if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge )
         {


@@ -412,7 +413,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
             (LPARAM)strMenuText.wx_str(),
             strMenuText.length(),
             xText,
             (LPARAM)strMenuText.wx_str(),
             strMenuText.length(),
             xText,

-            rc.y + (rc.GetHeight() - sizeRect.cy + 1)/2, // centre vertically
+            rc.y + (rc.height - sizeRect.cy) / 2, // centre vertically

             rc.GetWidth() - margin,
             sizeRect.cy,
             flags
             rc.GetWidth() - margin,
             sizeRect.cy,
             flags


@@ -430,7 +431,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
             ::DrawState(hdc, NULL, NULL,
                     (LPARAM)m_strAccel.wx_str(),
                     m_strAccel.length(),
             ::DrawState(hdc, NULL, NULL,
                     (LPARAM)m_strAccel.wx_str(),
                     m_strAccel.length(),

-                    rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
+                    rc.width - 16 - accel_width, rc.y + (rc.height - sizeRect.cy) / 2,

                     0, 0,
                     DST_TEXT |
                     (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
                     0, 0,
                     DST_TEXT |
                     (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));


@@ -571,7 +572,7 @@ BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState)
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG( _T("DrawStateBitmap: unknown wxDSBStates value") );
+            wxFAIL_MSG( wxT("DrawStateBitmap: unknown wxDSBStates value") );

             result = FALSE;
     }
 
             result = FALSE;
     }