silenced Watcom warning when deleting const pointer

[wxWidgets.git] / include / wx / listbox.h

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 219eccff3837298db7e483fe84d3d99c27a5c997..fb219e1ba547c9670c90c0e43cb05063af82c561 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -45,11 +45,11 @@ public:
     // all generic methods are in wxControlWithItems, except for the following
     // ones which are not yet implemented by wxChoice/wxComboBox
     void Insert(const wxString& item, unsigned int pos)
-        { DoInsert(item, pos); }
+        { /* return*/ wxControlWithItems::Insert(item,pos); }
     void Insert(const wxString& item, unsigned int pos, void *clientData)
-        { DoInsert(item, pos); SetClientData(pos, clientData); }
+        { /* return*/ wxControlWithItems::Insert(item,pos,clientData); }
     void Insert(const wxString& item, unsigned int pos, wxClientData *clientData)
-        { DoInsert(item, pos); SetClientObject(pos, clientData); }
+        { /* return*/ wxControlWithItems::Insert(item,pos,clientData); }
 
     void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos);
     void InsertItems(const wxArrayString& items, unsigned int pos)
@@ -103,13 +103,15 @@ public:
     // event.GetExtraLong())
     void Command(wxCommandEvent& event);
 
-    // compatibility - these functions are deprecated, use the new ones
-    // instead
-    bool Selected(int n) const { return IsSelected(n); }
-
     // returns the item number at a point or wxNOT_FOUND
     int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
 
+#if WXWIN_COMPATIBILITY_2_6
+    // compatibility - these functions are deprecated, use the new ones
+    // instead
+    wxDEPRECATED( bool Selected(int n) const );
+#endif // WXWIN_COMPATIBILITY_2_6
+
 protected:
     // NB: due to wxGTK implementation details, DoInsert() is implemented
     //     using DoInsertItems() and not the other way round
@@ -132,6 +134,10 @@ protected:
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 
+#if WXWIN_COMPATIBILITY_2_6
+    inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); }
+#endif // WXWIN_COMPATIBILITY_2_6
+
 // ----------------------------------------------------------------------------
 // include the platform-specific class declaration
 // ----------------------------------------------------------------------------