made the button of correct size again (Robert, why did you comment this out??)

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 2a7117c254f22a35998e4c122eeb47888dd6efe4..b25e4bcb648d33eff28401ee3023f152377762de 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -88,7 +88,7 @@ public:
         SetBitmapSelected(bmpPressed);
         SetBitmapDisabled(bmpDisabled);
 
         SetBitmapSelected(bmpPressed);
         SetBitmapDisabled(bmpDisabled);
 

-//        SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
+        SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());

     }
 
 protected:
     }
 
 protected:


@@ -304,7 +304,7 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);

-    m_btn->SetSize(x + wText, y, -1, height);
+    m_btn->SetSize(x + wText, y, sizeBtn.x, height);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------