From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Mon, 19 Jun 2006 21:14:19 +0000 (+0000)
Subject: [ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8e5ec129614e2473fd240f2a6e94ee56e3a9039b

[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 503005d9f6..ebac08be3f 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1126,8 +1126,14 @@ void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int fla
     wxRect selRect(rect);
     selRect.y += focusSpacingY;
     selRect.height -= (focusSpacingY*2);
-    selRect.x += m_widthCustomPaint + focusSpacingX;
-    selRect.width -= m_widthCustomPaint + (focusSpacingX*2);
+
+    int wcp = 0;
+
+    if ( !(flags & wxCONTROL_ISSUBMENU) )
+        wcp += m_widthCustomPaint;
+
+    selRect.x += wcp + focusSpacingX;
+    selRect.width -= wcp + (focusSpacingX*2);
 
     wxColour bgCol;
 
diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index c51a4bc77e..401dc1033d 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -298,8 +298,14 @@ void wxComboCtrl::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
     wxRect selRect(rect);
     selRect.y += focusSpacingY;
     selRect.height -= (focusSpacingY*2);
-    selRect.x += m_widthCustomPaint + focusSpacingX;
-    selRect.width -= m_widthCustomPaint + (focusSpacingX*2);
+
+    int wcp = 0;
+
+    if ( !(flags & wxCONTROL_ISSUBMENU) )
+        wcp += m_widthCustomPaint;
+
+    selRect.x += wcp + focusSpacingX;
+    selRect.width -= wcp + (focusSpacingX*2);
 
     if ( hTheme )
         theme = wxUxThemeEngine::GetIfActive();