Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW...

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

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index aa0714d83f5c066ef3a2e5834913718efc6978f2..777737f6c3a873dcbd076c1b42e0058bd9f8896c 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,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "controlwithitems.h"
 #endif
 
     #pragma implementation "controlwithitems.h"
 #endif
 


@@ -32,6 +32,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"

+    #include "wx/arrstr.h"

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


@@ -57,6 +58,15 @@ wxString wxItemContainer::GetStringSelection() const
     return s;
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // appending items
 // ----------------------------------------------------------------------------


@@ -70,6 +80,25 @@ void wxItemContainer::Append(const wxArrayString& strings)
     }
 }
 
     }
 }
 

+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
 // ----------------------------------------------------------------------------


@@ -122,4 +151,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