add IsOk() to all classes having Ok() method (patch 1570985)

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

diff --git a/include/wx/mac/carbon/radiobox.h b/include/wx/mac/carbon/radiobox.h
index 0f5d7d53ac1b3d6668873d08d0b988bdf92a7661..8cead0052233d15bb306b7e26afeefb34cbf709f 100644 (file)
--- a/include/wx/mac/carbon/radiobox.h
+++ b/include/wx/mac/carbon/radiobox.h
@@ -41,7 +41,7 @@ public:
          Create(parent, id, title, pos, size, choices,
                 majorDim, style, val, name);
      }
          Create(parent, id, title, pos, size, choices,
                 majorDim, style, val, name);
      }

-    ~wxRadioBox();
+    virtual ~wxRadioBox();

     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,


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

-// Specific functions (in wxWidgets2 reference)
+    // 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;
 
     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 

-    virtual size_t GetCount() const { return m_noItems; } ;
-
-    virtual wxString GetString(int item) const;
-    virtual void SetString(int item, const wxString& label) ;
+    virtual unsigned int GetCount() const { return m_noItems; }

 
 

-    virtual bool Enable(int item, bool enable = true);
-    virtual bool Show(int item, bool show = true);
+    virtual wxString GetString(unsigned int item) const;
+    virtual void SetString(unsigned int item, const wxString& label);

 
 

-    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);


@@ -84,7 +97,7 @@ public:
 protected:
     wxRadioButton    *m_radioButtonCycle;
 
 protected:
     wxRadioButton    *m_radioButtonCycle;
 

-    size_t            m_noItems;
+    unsigned int      m_noItems;

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