X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a305d600e2b4b233c9263abacc39e6da88c0171e..24e9f36bccb720dc7b8abd6187d9427fecbc75c9:/src/generic/combog.cpp

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 0987c8a856..56af94bb20 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -65,7 +65,7 @@
 #define TEXTCTRLXADJUST                 0 // position adjustment for wxTextCtrl, with zero indent
 #define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
-#define DEFAULT_DROPBUTTON_WIDTH        19
+#define DEFAULT_DROPBUTTON_WIDTH        22
 
 #else
 
@@ -187,8 +187,8 @@ bool wxGenericComboCtrl::Create(wxWindow *parent,
     // Set background
     SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering
 
-    // SetBestSize should be called last
-    SetBestSize(size);
+    // SetInitialSize should be called last
+    SetInitialSize(size);
 
     return true;
 }
@@ -276,8 +276,10 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
     dc.DrawRectangle(rect);
 
     if ( !m_btn )
+    {
         // Standard button rendering
-        DrawButton(dc,rectb,true);
+        DrawButton(dc,rectb);
+    }
 
     // paint required portion on the control
     if ( (!m_text || m_widthCustomPaint) )