cleanup in toplevel activation, and switching to native carbon event notification...

[wxWidgets.git] / src / common / ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 09cff4de8e05af9b4161f7c523db88d84fe69fc7..03be03f3dc1cc17287d09e967425192fe5cef4bc 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        common/ctrlsub.cpp
-// Purpose:     wxControlWithItems implementation
+// Purpose:     wxItemContainer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "controlwithitems.h"
 #endif
 
@@ -28,19 +28,27 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CONTROLS
+
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
+    #include "wx/arrstr.h"
 #endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
+wxItemContainer::~wxItemContainer()
+{
+    // this destructor is required for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 
-wxString wxControlWithItems::GetStringSelection() const
+wxString wxItemContainer::GetStringSelection() const
 {
     wxString s;
     int sel = GetSelection();
@@ -50,45 +58,102 @@ wxString wxControlWithItems::GetStringSelection() const
     return s;
 }
 
+wxArrayString wxItemContainer::GetStrings() const
+{
+    wxArrayString result ;
+    size_t count = GetCount() ;
+    for ( size_t n = 0 ; n < count ; n++ )
+        result.Add(GetString(n));
+    return result ;
+}
+
+// ----------------------------------------------------------------------------
+// appending items
+// ----------------------------------------------------------------------------
+
+void wxItemContainer::Append(const wxArrayString& strings)
+{
+    size_t count = strings.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        Append(strings[n]);
+    }
+}
+
+int wxItemContainer::Insert(const wxString& item, int pos, void *clientData)
+{
+    int n = DoInsert(item, pos);
+    if ( n != wxNOT_FOUND )
+        SetClientData(n, clientData);
+
+    return n;
+}
+
+int
+wxItemContainer::Insert(const wxString& item, int pos, wxClientData *clientData)
+{
+    int n = DoInsert(item, pos);
+    if ( n != wxNOT_FOUND )
+        SetClientObject(n, clientData);
+
+    return n;
+}
+
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 
-void wxControlWithItems::SetClientObject(int n, wxClientData *data)
+void wxItemContainer::SetClientObject(int n, wxClientData *data)
 {
-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
+    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
                   wxT("can't have both object and void client data") );
 
-    wxClientData *clientDataOld = DoGetItemClientObject(n);
-    if ( clientDataOld )
-        delete clientDataOld;
+    // 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);
+        if ( clientDataOld )
+            delete clientDataOld;
+    }
+    else // m_clientDataItemsType == wxClientData_None
+    {
+        // now we have object client data
+        m_clientDataItemsType = wxClientData_Object;
+    }
 
     DoSetItemClientObject(n, data);
-    m_clientDataItemsType = ClientData_Object;
 }
 
-wxClientData *wxControlWithItems::GetClientObject(int n) const
+wxClientData *wxItemContainer::GetClientObject(int n) const
 {
-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object,
                   wxT("this window doesn't have object client data") );
 
     return DoGetItemClientObject(n);
 }
 
-void wxControlWithItems::SetClientData(int n, void *data)
+void wxItemContainer::SetClientData(int n, void *data)
 {
-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
+    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Object,
                   wxT("can't have both object and void client data") );
 
     DoSetItemClientData(n, data);
-    m_clientDataItemsType = ClientData_Void;
+    m_clientDataItemsType = wxClientData_Void;
 }
 
-void *wxControlWithItems::GetClientData(int n) const
+void *wxItemContainer::GetClientData(int n) const
 {
-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
                   wxT("this window doesn't have void client data") );
 
     return DoGetItemClientData(n);
 }
 
+wxControlWithItems::~wxControlWithItems()
+{
+    // this destructor is required for Darwin
+}
+
+#endif // wxUSE_CONTROLS