X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e71a0aa95f767ab0302607b3c94dc155d72d5e61..29d916613c2fd716e2302298d059f48c2cab6507:/src/mac/carbon/combobox.cpp?ds=sidebyside

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 830e8564a7..27f2e33493 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -39,8 +39,15 @@ MenuHandle NewUniqueMenu()
 // ----------------------------------------------------------------------------
 
 // the margin between the text control and the choice
+#if TARGET_API_MAC_OSX
+// margin should be bigger on OS X due to blue highlight
+// around text control.
+static const wxCoord MARGIN = 6;
+static const int    POPUPWIDTH = 24;
+#else
 static const wxCoord MARGIN = 2;
 static const int    POPUPWIDTH = 18;
+#endif
 static const int    POPUPHEIGHT = 23;
 
 
@@ -149,6 +156,13 @@ protected:
         event2.SetString(m_cb->GetStringSelection());
         m_cb->ProcessCommand(event2);
     }
+    virtual wxSize DoGetBestSize() const
+    {
+        wxSize sz = wxChoice::DoGetBestSize() ;
+        if (! m_cb->HasFlag(wxCB_READONLY) )
+            sz.x = POPUPWIDTH;
+        return sz ;
+    }  
 
 private:
     wxComboBox *m_cb;
@@ -162,7 +176,10 @@ END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
-   // delete the controls now, don't leave them alive even though they would
+    // delete client objects
+    FreeData();
+
+    // 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
     if (m_text != NULL) {
@@ -182,12 +199,15 @@ wxComboBox::~wxComboBox()
 
 wxSize wxComboBox::DoGetBestSize() const
 {
+    if (!m_choice && !m_text)
+        return GetSize();
     wxSize size = m_choice->GetBestSize();
     
     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->GetBestSize();
-        
+        if (sizeText.y > size.y)
+            size.y = sizeText.y;
         size.x = POPUPWIDTH + sizeText.x + MARGIN;
     }
 
@@ -196,18 +216,32 @@ wxSize wxComboBox::DoGetBestSize() const
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     height = POPUPHEIGHT;
-    
-    wxControl::DoMoveWindow(x, y, width, height);
+    int origin = 0;
+#if TARGET_API_MAC_OSX
+    // give the controls some padding so that the text ctrl's borders
+    // and blue highlight can appear
+    origin = 4;
+#endif
+
+    wxControl::DoMoveWindow(x, y, width + origin, height + origin);
 
     if ( m_text == NULL )
     {
-        m_choice->SetSize(0, 0 , width, -1);
+        // we might not be fully constructed yet, therefore watch out...
+        if ( m_choice )
+            m_choice->SetSize(0, 0 , width, -1);
     }
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;
-        m_text->SetSize(0, 0, wText, height);
-        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
+#if TARGET_API_MAC_OSX
+        // also, we need to shrink the size of the wxTextCtrl a bit
+        // to make it appear properly on OS X.
+        height -= 8;
+        wText -= 8;
+#endif
+        m_text->SetSize(origin, origin, wText, height);
+        m_choice->SetSize(origin + wText + MARGIN, 0, POPUPWIDTH, -1);
     }    
 }
 
@@ -253,6 +287,22 @@ void wxComboBox::DelegateChoice( const wxString& value )
 }
 
 
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    wxCArrayString chs( choices );
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}
+
+
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
@@ -269,7 +319,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     m_choice = new wxComboBoxChoice(this, style );
-
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
@@ -290,6 +339,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         m_choice->DoAppend( choices[ i ] );
     }
 
+    SetBestSize(size);   // Needed because it is a wxControlWithItems
+
     return TRUE;
 }
 
@@ -309,6 +360,11 @@ wxString wxComboBox::GetValue() const
     return result;
 }
 
+int wxComboBox::GetCount() const
+{ 
+    return m_choice->GetCount() ; 
+}
+
 void wxComboBox::SetValue(const wxString& value)
 {
     int s = FindString (value);
@@ -414,31 +470,47 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
 
 void wxComboBox::DoSetItemClientData(int n, void* clientData) 
 {
-    return m_choice->SetClientData( n , clientData ) ;
+    return m_choice->DoSetItemClientData( n , clientData ) ;
 }
 
 void* wxComboBox::DoGetItemClientData(int n) const
 {
-    return m_choice->GetClientData( n ) ;
+    return m_choice->DoGetItemClientData( n ) ;
 }
 
 void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
 {
-    return m_choice->SetClientObject( n , clientData ) ;
+    return m_choice->DoSetItemClientObject( n , clientData ) ;
 }
 
 wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
 {
-    return m_choice->GetClientObject( n ) ;
+    return m_choice->DoGetItemClientObject( n ) ;
+}
+
+void wxComboBox::FreeData()
+{
+    if ( HasClientObjectData() )
+    {
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            SetClientObject( n, NULL );
+        }
+    }
 }
 
 void wxComboBox::Delete(int n)
 {
+    // force client object deletion
+    if( HasClientObjectData() )
+        SetClientObject( n, NULL );
     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {
+    FreeData();
     m_choice->Clear();
 }
 
@@ -494,12 +566,13 @@ void wxComboBox::SetString(int n, const wxString& s)
 }
 
 
-void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown)) 
+wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
+    return noErr ;
 }