X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da6069e29c0dd892eb2e55e4314499f68fb4c02b..e887bad5f3a10f5b0c1f173c34c694dda283d0cf:/src/common/ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 1d8421d728..ec05cae146 100644
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/ctrlsub.cpp
+// Name:        src/common/ctrlsub.cpp
 // Purpose:     wxItemContainer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "controlwithitems.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -32,76 +28,247 @@
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
+    #include "wx/arrstr.h"
 #endif
 
+IMPLEMENT_ABSTRACT_CLASS(wxControlWithItems, wxControl)
+
 // ============================================================================
-// implementation
+// wxItemContainerImmutable implementation
 // ============================================================================
 
+wxItemContainerImmutable::~wxItemContainerImmutable()
+{
+    // this destructor is required for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 
-wxString wxItemContainer::GetStringSelection() const
+wxString wxItemContainerImmutable::GetStringSelection() const
 {
     wxString s;
+
     int sel = GetSelection();
-    if ( sel != -1 )
-        s = GetString(sel);
+    if ( sel != wxNOT_FOUND )
+        s = GetString((unsigned int)sel);
 
     return s;
 }
 
+bool wxItemContainerImmutable::SetStringSelection(const wxString& s)
+{
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;
+
+    SetSelection(sel);
+
+    return true;
+}
+
+wxArrayString wxItemContainerImmutable::GetStrings() const
+{
+    wxArrayString result;
+
+    const unsigned int count = GetCount();
+    result.Alloc(count);
+    for ( unsigned int n = 0; n < count; n++ )
+        result.Add(GetString(n));
+
+    return result;
+}
+
+// ============================================================================
+// wxItemContainer implementation
+// ============================================================================
+
+wxItemContainer::~wxItemContainer()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// deleting items
+// ----------------------------------------------------------------------------
+
+void wxItemContainer::Clear()
+{
+    if ( HasClientObjectData() )
+    {
+        const unsigned count = GetCount();
+        for ( unsigned i = 0; i < count; ++i )
+            ResetItemClientObject(i);
+    }
+
+    m_clientDataItemsType = wxClientData_None;
+
+    DoClear();
+}
+
+void wxItemContainer::Delete(unsigned int pos)
+{
+    wxCHECK_RET( pos < GetCount(), _T("invalid index") );
+
+    if ( HasClientObjectData() )
+        ResetItemClientObject(pos);
+
+    DoDeleteOneItem(pos);
+
+    if ( IsEmpty() )
+    {
+        m_clientDataItemsType = wxClientData_None;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
+
+int wxItemContainer::DoInsertItemsInLoop(const wxArrayStringsAdapter& items,
+                                         unsigned int pos,
+                                         void **clientData,
+                                         wxClientDataType type)
+{
+    int n = wxNOT_FOUND;
+
+    const unsigned int count = items.GetCount();
+    for ( unsigned int i = 0; i < count; ++i )
+    {
+        n = DoInsertOneItem(items[i], pos++);
+        if ( n == wxNOT_FOUND )
+            break;
+
+        AssignNewItemClientData(n, clientData, i, type);
+    }
+
+    return n;
+}
+
+int
+wxItemContainer::DoInsertOneItem(const wxString& WXUNUSED(item),
+                                 unsigned int WXUNUSED(pos))
+{
+    wxFAIL_MSG( _T("Must be overridden if DoInsertItemsInLoop() is used") );
+
+    return wxNOT_FOUND;
+}
+
+
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 
-void wxItemContainer::SetClientObject(int n, wxClientData *data)
+void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)
 {
-    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object ||
+                    m_clientDataItemsType == wxClientData_None,
                   wxT("can't have both object and void client data") );
 
-    // when we call SetClientObject() for the first time, m_clientDataItemsType
-    // is still wxClientData_None and so calling DoGetItemClientObject() would
-    // fail (in addition to being useless) - don't do it
     if ( m_clientDataItemsType == wxClientData_Object )
     {
-        wxClientData *clientDataOld = DoGetItemClientObject(n);
+        wxClientData * clientDataOld
+            = wx_static_cast(wxClientData *, DoGetItemClientData(n));
         if ( clientDataOld )
             delete clientDataOld;
     }
     else // m_clientDataItemsType == wxClientData_None
     {
         // now we have object client data
+        DoInitItemClientData();
+
         m_clientDataItemsType = wxClientData_Object;
     }
 
-    DoSetItemClientObject(n, data);
+    DoSetItemClientData(n, data);
 }
 
-wxClientData *wxItemContainer::GetClientObject(int n) const
+wxClientData *wxItemContainer::GetClientObject(unsigned int n) const
 {
-    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object,
+    wxCHECK_MSG( m_clientDataItemsType == wxClientData_Object, NULL,
                   wxT("this window doesn't have object client data") );
 
-    return DoGetItemClientObject(n);
+    return wx_static_cast(wxClientData *, DoGetItemClientData(n));
 }
 
-void wxItemContainer::SetClientData(int n, void *data)
+void wxItemContainer::SetClientData(unsigned int n, void *data)
 {
-    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Object,
+    if ( m_clientDataItemsType == wxClientData_None )
+    {
+        DoInitItemClientData();
+        m_clientDataItemsType = wxClientData_Void;
+    }
+
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
                   wxT("can't have both object and void client data") );
 
     DoSetItemClientData(n, data);
-    m_clientDataItemsType = wxClientData_Void;
 }
 
-void *wxItemContainer::GetClientData(int n) const
+void *wxItemContainer::GetClientData(unsigned int n) const
 {
-    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
+    wxCHECK_MSG( m_clientDataItemsType == wxClientData_Void, NULL,
                   wxT("this window doesn't have void client data") );
 
     return DoGetItemClientData(n);
 }
 
+void wxItemContainer::AssignNewItemClientData(unsigned int pos,
+                                              void **clientData,
+                                              unsigned int n,
+                                              wxClientDataType type)
+{
+    switch ( type )
+    {
+        case wxClientData_Object:
+            SetClientObject
+            (
+                pos,
+                (wx_reinterpret_cast(wxClientData **, clientData))[n]
+            );
+            break;
+
+        case wxClientData_Void:
+            SetClientData(pos, clientData[n]);
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown client data type") );
+            // fall through
+
+        case wxClientData_None:
+            // nothing to do
+            break;
+    }
+}
+
+void wxItemContainer::ResetItemClientObject(unsigned int n)
+{
+    wxClientData * const data = GetClientObject(n);
+    if ( data )
+    {
+        delete data;
+        DoSetItemClientData(n, NULL);
+    }
+}
+
+// ============================================================================
+// wxControlWithItems implementation
+// ============================================================================
+
+void
+wxControlWithItemsBase::InitCommandEventWithItems(wxCommandEvent& event, int n)
+{
+    InitCommandEvent(event);
+
+    if ( n != wxNOT_FOUND )
+    {
+        if ( HasClientObjectData() )
+            event.SetClientObject(GetClientObject(n));
+        else if ( HasClientUntypedData() )
+            event.SetClientData(GetClientData(n));
+    }
+}
+
 #endif // wxUSE_CONTROLS