[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1032
Date       : Fri May 12 20:05:32 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxXtra/combo.cpp

Fix for Luke's combo box drawing problem


Diff:
Index: Trunk/XaraLX/wxXtra/combo.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/combo.cpp	(revision 1031)
+++ Trunk/XaraLX/wxXtra/combo.cpp	(revision 1032)
@@ -1144,7 +1144,18 @@
         // Need to clear button background even if m_btn is present
         // (assume non-button background was cleared just before this call so brushes are good)
         if ( paintBg )
+        {
+            wxColour bgCol;
+
+            if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
+                bgCol = GetParent()->GetBackgroundColour();
+            else
+                bgCol = GetBackgroundColour();
+
+            dc.SetBrush(bgCol);
+            dc.SetPen(bgCol);
             dc.DrawRectangle(rect);
+        }
 
         // Draw standard button
         wxRendererNative::Get().DrawComboBoxDropButton(this,


Xara