applying patch, fixes #10523

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index b41cb1734ae4bd757c79c7d4b9e75e8540d63ec8..8cb39959788f1f4af2027eb2acba8e5e1f8dd33a 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -29,12 +29,14 @@
     #include "wx/settings.h"
     #include "wx/menuitem.h"
     #include "wx/module.h"
+    #include "wx/msw/wrapcctl.h"
 #endif
 
 #include "wx/ownerdrw.h"
 #include "wx/fontutil.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/private/metrics.h"
 #include "wx/msw/dc.h"
 
 #ifndef SPI_GETKEYBOARDCUES
@@ -87,33 +89,11 @@ public:
     }
 
 private:
-    static NONCLIENTMETRICS GetNCM()
-    {
-        WinStruct<NONCLIENTMETRICS> nm;
-        if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) )
-        {
-#if WINVER >= 0x0600
-            // a new field has been added to NONCLIENTMETRICS under Vista, so
-            // the call to SystemParametersInfo() fails if we use the struct
-            // size incorporating this new value on an older system -- retry
-            // without it
-            nm.cbSize -= sizeof(int);
-            if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) )
-#endif // WINVER >= 0x0600
-            {
-                // maybe we should initialize the struct with some defaults?
-                wxLogLastError(_T("SystemParametersInfo(SPI_GETNONCLIENTMETRICS)"));
-            }
-        }
-
-        return nm;
-    }
-
     static void DoInitMetrics()
     {
         // iMenuHeight is the menu bar height and the menu items are less tall,
         // although I don't know by how much -- below is the value for my system
-        ms_systemMenuHeight = GetNCM().iMenuHeight - 4;
+        ms_systemMenuHeight = wxMSWImpl::GetNonClientMetrics().iMenuHeight - 4;
 
         wxASSERT_MSG( ms_systemMenuHeight > 0,
                         "menu height should be positive" );
@@ -129,7 +109,8 @@ private:
 
     static void DoInitFont()
     {
-        ms_systemMenuFont = new wxFont(wxNativeFontInfo(GetNCM().lfMenuFont));
+        ms_systemMenuFont = new
+          wxFont(wxNativeFontInfo(wxMSWImpl::GetNonClientMetrics().lfMenuFont));
     }
 
     static wxFont* ms_systemMenuFont;
@@ -259,10 +240,6 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
         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)
     {
@@ -278,11 +255,11 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
         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 ((size_t)GetMarginWidth() < widthBmp)
+            if ( GetMarginWidth() < widthBmp )
                 SetMarginWidth(widthBmp);
         }
         else // we must allocate enough space for the bitmap
@@ -294,6 +271,15 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
     // 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 )
@@ -552,4 +538,50 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
 }
 
 
+// ----------------------------------------------------------------------------
+// global helper functions implemented here
+// ----------------------------------------------------------------------------
+
+BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState)
+{
+    // determine size of bitmap image
+    BITMAP bmp;
+    if ( !::GetObject(hBitmap, sizeof(BITMAP), &bmp) )
+        return FALSE;
+
+    BOOL result;
+
+    switch ( uState )
+    {
+        case wxDSB_NORMAL:
+        case wxDSB_SELECTED:
+            {
+                // uses image list functions to draw
+                //  - normal bitmap with support transparency
+                //    (image list internally create mask etc.)
+                //  - blend bitmap with the background colour
+                //    (like default selected items)
+                HIMAGELIST hIml = ::ImageList_Create(bmp.bmWidth, bmp.bmHeight,
+                                                     ILC_COLOR32 | ILC_MASK, 1, 1);
+                ::ImageList_Add(hIml, hBitmap, NULL);
+                UINT fStyle = uState == wxDSB_SELECTED ? ILD_SELECTED : ILD_NORMAL;
+                result = ::ImageList_Draw(hIml, 0, hDC, x, y, fStyle);
+                ::ImageList_Destroy(hIml);
+            }
+            break;
+
+        case wxDSB_DISABLED:
+            result = ::DrawState(hDC, NULL, NULL, (LPARAM)hBitmap, 0, x, y,
+                                 bmp.bmWidth, bmp.bmHeight,
+                                 DST_BITMAP | DSS_DISABLED);
+            break;
+
+        default:
+            wxFAIL_MSG( _T("DrawStateBitmap: unknown wxDSBStates value") );
+            result = FALSE;
+    }
+
+    return result;
+}
+
 #endif // wxUSE_OWNER_DRAWN