[ 1492053 ] Add wxVListBox style callbacks to wxOwnerDrawnComboBox.

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

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index d837a94b04ae1886c209d91c98b8459d65fc1abb..837095cc864638f6fe8b8548cdf53add3e1800f8 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -52,7 +52,7 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper
 {
 public:
     // ctors and such
-    wxListBox() { Init(); }
+    wxListBox() : wxScrollHelper(this) { Init(); }
     wxListBox(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
@@ -61,6 +61,7 @@ public:
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxListBoxNameStr )
+        : wxScrollHelper(this)
     {
         Init();
 
@@ -96,34 +97,34 @@ public:
 
     // implement the listbox interface defined by wxListBoxBase
     virtual void Clear();
-    virtual void Delete(int n);
+    virtual void Delete(unsigned int n);
 
-    virtual int GetCount() const
-        { return (int)m_strings->GetCount(); }
-    virtual wxString GetString(int n) const
+    virtual unsigned int GetCount() const
+        { return (unsigned int)m_strings->GetCount(); }
+    virtual wxString GetString(unsigned int n) const
         { return m_strings->Item(n); }
-    virtual void SetString(int n, const wxString& s);
+    virtual void SetString(unsigned int n, const wxString& s);
     virtual int FindString(const wxString& s, bool bCase = false) const
         { return m_strings->Index(s, bCase); }
 
     virtual bool IsSelected(int n) const
         { return m_selections.Index(n) != wxNOT_FOUND; }
-    virtual void DoSetSelection(int n, bool select);
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
 protected:
+    virtual void DoSetSelection(int n, bool select);
     virtual int DoAppendOnly(const wxString& item);
     virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
 
     virtual void DoSetFirstItem(int n);
 
-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void* DoGetItemClientData(int n) const;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
 
 public:
     // override some more base class methods