OS/2 updates for debugging and statusbar processing

[wxWidgets.git] / include / wx / mac / choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 46829449411f1bf37443842d38a02dfdb0666976..7e8d94d2a9ed22cc68ed4c4a8c238350aa1b1946 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxChoice: public wxControl
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
  public:
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
  public:

-  inline wxChoice() { m_noStrings = 0; }
+  inline wxChoice() {}

 
   inline wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
 
   inline wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -52,13 +52,15 @@ 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 wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 
   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 wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 

-  virtual inline int Number() const { return m_noStrings; }
+  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 */ } ;


@@ -66,7 +68,7 @@ class WXDLLEXPORT wxChoice: public wxControl
        void            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
 
 protected:
        void            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
 
 protected:

-  int m_noStrings;
+  wxArrayString m_strings;

   MenuHandle   m_macPopUpMenuHandle ;
 };
 
   MenuHandle   m_macPopUpMenuHandle ;
 };