update from Reinout van Schouwen

[wxWidgets.git] / src / common / combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 82345122b808fabe662fc75af57153ec8771a98b..2595b6ad92ace1787abfa67ff16d40f82bb3fa68 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1347,11 +1347,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int paintBg )
         }
 
         // Draw standard button
-        if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)
-            drawState |= wxCONTROL_SIZE_SMALL;
-        else if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)
-            drawState |= wxCONTROL_SIZE_MINI;
-        
         wxRendererNative::Get().DrawComboBoxDropButton(this,
                                                        dc,
                                                        drawRect,
@@ -1385,11 +1380,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int paintBg )
                 dc.DrawRectangle(rect);
             }
 
-            if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)
-                drawState |= wxCONTROL_SIZE_SMALL;
-            else if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)
-                drawState |= wxCONTROL_SIZE_MINI;
-
             wxRendererNative::Get().DrawPushButton(this,
                                                    dc,
                                                    drawRect,
@@ -1865,7 +1855,7 @@ void wxComboCtrlBase::ShowPopup()
     }
 
     winPopup->Enable();
-    
+
     wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
 
     wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,