X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/465605e0fdb03081c05d822e795be4b29dbd9a32..b8f2db1f34fcf92ad8a5cdf5334f2000c9f292f4:/src/mac/carbon/combobox.cpp?ds=sidebyside

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 7bac2630c4..4fa350e709 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -51,7 +51,7 @@ class wxComboBoxText : public wxTextCtrl
 {
 public:
     wxComboBoxText( wxComboBox * cb )
-        : wxTextCtrl( cb->GetParent(), 1 )
+        : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;
     }
@@ -60,8 +60,9 @@ protected:
     void OnTextChange( wxCommandEvent& event )
     {
         wxString    s = GetValue();
-            
-        m_cb->DelegateTextChanged( s );
+        
+        if (!s.IsEmpty())
+            m_cb->DelegateTextChanged( s );
 
         event.Skip();
     }
@@ -80,7 +81,7 @@ class wxComboBoxChoice : public wxChoice
 {
 public:
     wxComboBoxChoice(wxComboBox *cb, int style)
-        : wxChoice( cb->GetParent(), 1 )
+        : wxChoice( cb , 1 )
     {
         m_cb = cb;
     }
@@ -103,16 +104,19 @@ BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
     EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 
-
-
-
 wxComboBox::~wxComboBox()
 {
-   // delete the controls now, don't leave them alive even though they woudl
+   // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
-    delete m_text;
-    delete m_choice;
+    if (m_text != NULL) {
+        delete m_text;
+        m_text = NULL;
+    }
+    if (m_choice != NULL) {
+        delete m_choice;
+        m_choice = NULL;
+    }
 }
 
 
@@ -141,13 +145,13 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 
     if ( m_text == 0 )
     {
-        m_choice->SetSize(x, y, width, -1);
+        m_choice->SetSize(0, 0 , width, -1);
     }
     else
     {
         wxCoord wText = width - POPUPWIDTH;
-        m_text->SetSize(x, y, wText, height);
-        m_choice->SetSize(x + wText + MARGIN, y, POPUPWIDTH, -1);
+        m_text->SetSize(0, 0, wText, height);
+        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
     }    
 }
 
@@ -162,13 +166,6 @@ bool wxComboBox::Enable(bool enable)
     if ( !wxControl::Enable(enable) )
         return FALSE;
 
-    m_choice->Enable(enable);
-    
-    if ( m_text != 0 )
-    {
-        m_text->Enable(enable);
-    }
-
     return TRUE;
 }
 
@@ -177,17 +174,6 @@ bool wxComboBox::Show(bool show)
     if ( !wxControl::Show(show) )
         return FALSE;
 
-    // under GTK Show() is called the first time before we are fully
-    // constructed
-    if ( m_choice )
-    {
-        m_choice->Show(show);
-        if ( m_text != 0 )
-        {
-            m_text->Show(show);
-        }
-    }
-
     return TRUE;
 }
 
@@ -220,13 +206,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     Rect bounds ;
     Str255 title ;
 
-    if ( !wxControl::Create(parent, id, pos, size, style,
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {
         return FALSE;
     }
 
-    m_choice = new wxComboBoxChoice(this, style);
+    m_choice = new wxComboBoxChoice(this, style );
 
     wxSize csize = size;
     if ( style & wxCB_READONLY )
@@ -242,21 +228,12 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
     
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
+    
     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     }
 
-    // have to disable this window to avoid interfering it with message
-    // processing to the text and the button... but pretend it is enabled to
-    // make IsEnabled() return TRUE
-    wxControl::Enable(FALSE); // don't use non virtual Disable() here!
-    m_isEnabled = TRUE;
-
-    // we don't even need to show this window itself - and not doing it avoids
-    // that it overwrites the text control
-    wxControl::Show(FALSE);
-
     return TRUE;
 }
 
@@ -366,7 +343,11 @@ void wxComboBox::SetSelection(long from, long to)
 
 void wxComboBox::Append(const wxString& item)
 {
-    m_choice->DoAppend( item );
+    // I am not sure what other ports do,
+    // but wxMac chokes on empty entries.
+
+    if (!item.IsEmpty())
+        m_choice->DoAppend( item );
 }
 
 void wxComboBox::Delete(int n)