Fixes/makefiles for building data view control on Windows

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

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 6ab126f1decc74cb72d42681aa62bcc173693e10..a82785f5ba15e6d9eed998f6dfd72df2d5ff3bc8 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -99,8 +99,8 @@ public:
     virtual void Clear();
     virtual void Delete(int n);
 
     virtual void Clear();
     virtual void Delete(int n);
 

-    virtual int GetCount() const
-        { return (int)m_strings->GetCount(); }
+    virtual size_t GetCount() const
+        { return m_strings->GetCount(); }

     virtual wxString GetString(int n) const
         { return m_strings->Item(n); }
     virtual void SetString(int n, const wxString& s);
     virtual wxString GetString(int n) const
         { return m_strings->Item(n); }
     virtual void SetString(int n, const wxString& s);


@@ -109,11 +109,11 @@ public:
 
     virtual bool IsSelected(int n) const
         { return m_selections.Index(n) != wxNOT_FOUND; }
 
     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 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 int DoAppendOnly(const wxString& item);
     virtual int DoAppend(const wxString& item);
     virtual void DoInsertItems(const wxArrayString& items, int pos);