wxMotif for OS/2 adjustements. Source cleaning.

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

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index abbaabb4ffaf602277b16ff739d3d481835fa2e2..7f294c3f5d61d7ab2c3cbbad990d12940fc5a1c4 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "controlwithitems.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,17 +28,23 @@
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"

+    #include "wx/arrstr.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================

-// implementation
+// wxItemContainerImmutable implementation

 // ============================================================================
 
 // ============================================================================
 

+wxItemContainerImmutable::~wxItemContainerImmutable()
+{
+    // this destructor is required for Darwin
+}
+

 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 

-wxString wxItemContainer::GetStringSelection() const
+wxString wxItemContainerImmutable::GetStringSelection() const

 {
     wxString s;
     int sel = GetSelection();
 {
     wxString s;
     int sel = GetSelection();


@@ -52,6 +54,70 @@ wxString wxItemContainer::GetStringSelection() const
     return s;
 }
 
     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 size_t count = GetCount();
+    result.Alloc(count);
+    for ( size_t n = 0; n < count; n++ )
+        result.Add(GetString(n));
+
+    return result;
+}
+
+// ============================================================================
+// wxItemContainer implementation
+// ============================================================================
+
+wxItemContainer::~wxItemContainer()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------


@@ -61,12 +127,22 @@ void wxItemContainer::SetClientObject(int n, wxClientData *data)
     wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
                   wxT("can't have both object and void client data") );
 
     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);
 
     DoSetItemClientObject(n, data);

-    m_clientDataItemsType = wxClientData_Object;

 }
 
 wxClientData *wxItemContainer::GetClientObject(int n) const
 }
 
 wxClientData *wxItemContainer::GetClientObject(int n) const


@@ -94,4 +170,9 @@ void *wxItemContainer::GetClientData(int n) const
     return DoGetItemClientData(n);
 }
 
     return DoGetItemClientData(n);
 }
 

+wxControlWithItems::~wxControlWithItems()
+{
+    // this destructor is required for Darwin
+}
+

 #endif // wxUSE_CONTROLS
 #endif // wxUSE_CONTROLS