wxListbox::GetSelections() now takes a wxArrayInt instead of "int **"

(as under wxGTK)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 97d0084199dfef2ec721c20e9f025f8c47dd8449..1b6f0001dfba616594b58753e91aa84548e8df09 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -29,6 +29,9 @@ WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif
 
   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif
 

+// forward decl for GetSelections()
+class wxArrayInt;
+

 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // List box item
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // List box item


@@ -82,14 +85,14 @@ class WXDLLEXPORT wxListBox: public wxControl
   virtual void Deselect(const int n);
 
   // For single choice list item only
   virtual void Deselect(const int n);
 
   // For single choice list item only

-  virtual int GetSelection(void) const ;
+  virtual int GetSelection() const ;

   virtual void Delete(const int n);
   virtual char *GetClientData(const int n) const ;
   virtual void SetClientData(const int n, char *clientData);
   virtual void SetString(const int n, const wxString& s);
 
   // For single or multiple choice list item
   virtual void Delete(const int n);
   virtual char *GetClientData(const int n) const ;
   virtual void SetClientData(const int n, char *clientData);
   virtual void SetString(const int n, const wxString& s);
 
   // For single or multiple choice list item

-  virtual int GetSelections(int **listSelections) const ;
+  virtual int GetSelections(wxArrayInt& aSelections) const;

   virtual bool Selected(const int n) const ;
   virtual wxString GetString(const int n) const ;
   virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
   virtual bool Selected(const int n) const ;
   virtual wxString GetString(const int n) const ;
   virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);


@@ -122,7 +125,6 @@ class WXDLLEXPORT wxListBox: public wxControl
  protected:
   int m_noItems;
   int m_selected;
  protected:
   int m_noItems;
   int m_selected;

-  int *m_selections;

 
 #if USE_OWNER_DRAWN
   // control items
 
 #if USE_OWNER_DRAWN
   // control items