Applied patch [ 596061 ] Adds more navigation buttons to preview

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

diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h
index 514ef7f849136332cfd5aa8fd876b3005aa4140b..21910dc6f917d134512365dcea91f0d39a7ec713 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -43,21 +43,25 @@ public:
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
 // Specific functions (in wxWindows2 reference)
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
 // Specific functions (in wxWindows2 reference)

-       bool Enable(bool enable);
-       void Enable(int item, bool enable);
-       int FindString(const wxString& s) const;
-       wxString GetLabel() const;
-       wxString GetLabel(int item) const;
-       int GetSelection() const;
-       wxString GetString(int item) const;
-       virtual wxString GetStringSelection() const;
+       virtual void SetSelection(int item);
+       virtual int GetSelection() const;
+       

        inline virtual int GetCount() const { return m_noItems; } ;
        inline virtual int GetCount() const { return m_noItems; } ;

-       void SetLabel(const wxString& label) ;
-       void SetLabel(int item, const wxString& label) ;
-       void SetSelection(int item);
-       virtual bool SetStringSelection(const wxString& s);
-       bool Show(bool show);
-       void Show(int item, bool show) ;
+
+       virtual wxString GetString(int item) const;
+       virtual void SetString(int item, const wxString& label) ;
+       
+       virtual void Enable(int item, bool enable);
+       virtual void Show(int item, bool show) ;
+
+    virtual int GetColumnCount() const ;
+    virtual int GetRowCount() const ;
+
+
+       virtual bool Enable(bool enable = TRUE);
+       virtual wxString GetLabel() const;
+       virtual void SetLabel(const wxString& label) ;
+       virtual bool Show(bool show = TRUE);

 
 // Other external functions 
        void Command(wxCommandEvent& event);
 
 // Other external functions 
        void Command(wxCommandEvent& event);


@@ -76,11 +80,10 @@ protected:
        int               m_noRowsOrCols;
 
 // Internal functions 
        int               m_noRowsOrCols;
 
 // Internal functions 

+    virtual wxSize DoGetBestSize() const ;

        virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
        virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

-       int GetNumHor() const;
-       int GetNumVer() const;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };