Added wxChoice::GetCount() and Select()

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index a6a84a65b6806aade06d86879f95f873c962c92f..7e8d94d2a9ed22cc68ed4c4a8c238350aa1b1946 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -52,6 +52,7 @@ class WXDLLEXPORT wxChoice: public wxControl
   virtual void Clear();
   virtual int GetSelection() const ;
   virtual void SetSelection(int n);
   virtual void Clear();
   virtual int GetSelection() const ;
   virtual void SetSelection(int n);

+  virtual inline void Select( int n ) { SetSelection( n ); }

   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);


@@ -59,6 +60,7 @@ class WXDLLEXPORT wxChoice: public wxControl
   virtual bool SetStringSelection(const wxString& sel);
 
   virtual inline int Number() const { return m_strings.GetCount(); }
   virtual bool SetStringSelection(const wxString& sel);
 
   virtual inline int Number() const { return m_strings.GetCount(); }

+  virtual inline int GetCount() const { return m_strings.GetCount(); }

   virtual void Command(wxCommandEvent& event);
 
   virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;
   virtual void Command(wxCommandEvent& event);
 
   virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;