SetSizeHints hacks are not needed any longer since the minsize is not

set by default any longer

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index b1b55589f0fa0a054bd3a50dcb0cdac195ffcafe..27f2e3349356b0abb0bdcbd03466d3337e68e1e4 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -62,9 +62,6 @@ public:
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;

-
-        // remove the default minsize, the combobox will have one instead
-        SetSizeHints(-1,-1);

     }
 
 protected:
     }
 
 protected:


@@ -145,9 +142,6 @@ public:
         : wxChoice( cb , 1 )
     {
         m_cb = cb;
         : wxChoice( cb , 1 )
     {
         m_cb = cb;

-
-        // remove the default minsize, the combobox will have one instead
-        SetSizeHints(-1,-1);

     }
 
 protected:
     }
 
 protected:


@@ -205,7 +199,7 @@ wxComboBox::~wxComboBox()
 
 wxSize wxComboBox::DoGetBestSize() const
 {
 
 wxSize wxComboBox::DoGetBestSize() const
 {

-    if (!m_choice || !m_text)
+    if (!m_choice && !m_text)

         return GetSize();
     wxSize size = m_choice->GetBestSize();
     
         return GetSize();
     wxSize size = m_choice->GetBestSize();
     


@@ -325,7 +319,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     m_choice = new wxComboBoxChoice(this, style );
     }
 
     m_choice = new wxComboBoxChoice(this, style );

-    m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;

     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {


@@ -346,7 +339,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         m_choice->DoAppend( choices[ i ] );
     }
 
         m_choice->DoAppend( choices[ i ] );
     }
 

-    SetBestSize(csize);   // Needed because it is a wxControlWithItems
+    SetBestSize(size);   // Needed because it is a wxControlWithItems

 
     return TRUE;
 }
 
     return TRUE;
 }