renamed wxWave to wxSound; compatibility fixes

[wxWidgets.git] / src / mac / combobox.cpp

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 0aa01b1a2b85bc541dd7801a3f0cf9bf1da9f2c9..27aa1a58de3e840e05d6153dc326262a3e011822 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
 // Purpose:     wxComboBox class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -60,7 +60,7 @@ public:
 protected:
     void OnChar( wxKeyEvent& event )
     {
-        if ( event.KeyCode() == WXK_RETURN )
+        if ( event.GetKeyCode() == WXK_RETURN )
         {
             wxString value = GetValue();
 
@@ -96,7 +96,7 @@ protected:
 
                 wxWindow *parent = GetParent();
                 while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                  parent = parent->GetParent() ;
+                    parent = parent->GetParent() ;
                 }
                 if ( parent && parent->GetDefaultItem() )
                 {
@@ -162,7 +162,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) {
@@ -205,7 +208,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     }
     else
     {
-        wxCoord wText = width - POPUPWIDTH;
+        wxCoord wText = width - POPUPWIDTH - MARGIN;
         m_text->SetSize(0, 0, wText, height);
         m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
     }    
@@ -257,15 +260,27 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,
-           int n, const wxString choices[],
+           const wxArrayString& choices,
            long style,
            const wxValidator& validator,
            const wxString& name)
 {
+    wxCArrayString chs( choices );
 
-    Rect bounds ;
-    Str255 title ;
+    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,
+           const wxSize& size,
+           int n, const wxString choices[],
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {
@@ -315,6 +330,11 @@ wxString wxComboBox::GetValue() const
 
 void wxComboBox::SetValue(const wxString& value)
 {
+    int s = FindString (value);
+    if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
+    {
+        m_choice->Append(value) ;
+    }
     SetStringSelection( value ) ;
 }
 
@@ -401,22 +421,59 @@ void wxComboBox::SetSelection(long from, long to)
     // TODO
 }
 
-void wxComboBox::Append(const wxString& item)
+int wxComboBox::DoAppend(const wxString& item) 
+{
+    return m_choice->DoAppend( item ) ;
+}
+
+int wxComboBox::DoInsert(const wxString& item, int pos) 
+{
+    return m_choice->DoInsert( item , pos ) ;
+}
+
+void wxComboBox::DoSetItemClientData(int n, void* clientData) 
+{
+    return m_choice->DoSetItemClientData( n , clientData ) ;
+}
+
+void* wxComboBox::DoGetItemClientData(int n) const
+{
+    return m_choice->DoGetItemClientData( n ) ;
+}
+
+void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+    return m_choice->DoSetItemClientObject( n , clientData ) ;
+}
+
+wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
 {
-    // I am not sure what other ports do,
-    // but wxMac chokes on empty entries.
+    return m_choice->DoGetItemClientObject( n ) ;
+}
 
-    if (!item.IsEmpty())
-        m_choice->DoAppend( item );
+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();
 }
 
@@ -451,7 +508,7 @@ wxString wxComboBox::GetStringSelection() const
     if (sel > -1)
         return wxString(this->GetString (sel));
     else
-        return wxString("");
+        return wxEmptyString;
 }
 
 bool wxComboBox::SetStringSelection(const wxString& sel)
@@ -466,7 +523,13 @@ bool wxComboBox::SetStringSelection(const wxString& sel)
         return FALSE;
 }
 
-void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxComboBox::SetString(int n, const wxString& s) 
+{
+    m_choice->SetString( n , s ) ;
+}
+
+
+void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown)) 
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());