Removed no longer needed "DECLARE_EVENT_TABLE()" completing the previous change.

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

diff --git a/include/wx/mac/classic/radiobox.h b/include/wx/mac/classic/radiobox.h
index 6a895305fe60f0cefd0fdbdbd78053aacfe9d72b..11fdf686adbb049b971e389d12cf8f1bb06f1a4f 100644 (file)
--- a/include/wx/mac/classic/radiobox.h
+++ b/include/wx/mac/classic/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.h
+// Name:        wx/mac/classic/radiobox.h

 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -54,22 +54,36 @@ public:
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 

+    // Enabling
+    virtual bool Enable(bool enable = true);
+    virtual bool Enable(unsigned int item, bool enable = true);
+    virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+
+    // Showing
+    virtual bool Show(bool show = true);
+    virtual bool Show(unsigned int item, bool show = true);
+    virtual bool IsItemShown(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+

 // Specific functions (in wxWidgets2 reference)
     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 
 // Specific functions (in wxWidgets2 reference)
     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 

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

 
 

-    virtual wxString GetString(int item) const;
-    virtual void SetString(int item, const wxString& label) ;
+    virtual wxString GetString(unsigned int item) const;
+    virtual void SetString(unsigned int item, const wxString& label);

 
 

-    virtual bool Enable(int item, bool enable = true);
-    virtual bool Show(int item, bool show = true);

 
 

-    virtual bool Enable(bool enable = true);

     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label) ;
     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);


@@ -80,10 +94,11 @@ public:
     inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     void OnRadioButton( wxCommandEvent& event ) ;
     inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     void OnRadioButton( wxCommandEvent& event ) ;

+

 protected:
 protected:

-    wxRadioButton        *m_radioButtonCycle;
+    wxRadioButton    *m_radioButtonCycle;

 
 

-    int               m_noItems;
+    unsigned int      m_noItems;

     int               m_noRowsOrCols;
 
 // Internal functions
     int               m_noRowsOrCols;
 
 // Internal functions