[ 1492036 ] Fix incorrect wxComboCtrl minimum size.

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

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index d99937a3feb499503d9d10fb7f16b92372a24434..84d31db480957a28335f4897242673786b375808 100644 (file)
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -148,13 +148,13 @@ bool wxGenericComboControl::Create(wxWindow *parent,
 
     // create main window
     if ( !wxComboCtrlBase::Create(parent,
-                                     id,
-                                     value,
-                                     wxDefaultPosition,
-                                     wxDefaultSize,
-                                     style | wxFULL_REPAINT_ON_RESIZE,
-                                     wxDefaultValidator,
-                                     name) )
+                                  id,
+                                  value,
+                                  pos,
+                                  size,
+                                  style | wxFULL_REPAINT_ON_RESIZE,
+                                  wxDefaultValidator,
+                                  name) )
         return false;
 
     // Create textctrl, if necessary
@@ -166,8 +166,8 @@ bool wxGenericComboControl::Create(wxWindow *parent,
     // Set background
     SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering
 
-    // SetSize should be called last
-    SetSize(pos.x,pos.y,size.x,size.y);
+    // SetBestSize should be called last
+    SetBestSize(size);
 
     return true;
 }

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 92711ac9d6a0a2c2262da2d689a5fc4eb931cad5..7ebac8b6aa5858503c7b0367f50f49ff85f76df0 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combo.cpp
+// Name:        src/msw/combo.cpp
 // Purpose:     wxMSW wxComboCtrl
 // Author:      Jaakko Salli
 // Modified by:
@@ -119,13 +119,13 @@ bool wxComboCtrl::Create(wxWindow *parent,
 
     // create main window
     if ( !wxComboCtrlBase::Create(parent,
-                            id,
-                            value,
-                            wxDefaultPosition,
-                            wxDefaultSize,
-                            style | wxFULL_REPAINT_ON_RESIZE,
-                            wxDefaultValidator,
-                            name) )
+                           id,
+                           value,
+                           pos,
+                           size,
+                           style | wxFULL_REPAINT_ON_RESIZE,
+                           wxDefaultValidator,
+                           name) )
         return false;
 
     if ( style & wxCC_STD_BUTTON )
@@ -140,8 +140,8 @@ bool wxComboCtrl::Create(wxWindow *parent,
     // Prepare background for double-buffering
     SetBackgroundStyle( wxBG_STYLE_CUSTOM );
 
-    // SetSize should be called last
-    SetSize(pos.x,pos.y,size.x,size.y);
+    // SetBestSize should be called last
+    SetBestSize(size);
 
     return true;
 }
@@ -448,7 +448,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
                                          &r);
 
         drawButBg = false;
-    } 
+    }
 
     // Standard button rendering
     DrawButton(dc,rectb,drawButBg);