The Great wxRegion Refactoring:

[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 a3e5f388021e57474b32d50add32fbc0b2e114f5..8cead0052233d15bb306b7e26afeefb34cbf709f 100644 (file)
--- a/include/wx/mac/carbon/radiobox.h
+++ b/include/wx/mac/carbon/radiobox.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.h
+// Name:        wx/mac/carbon/radiobox.h
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "radiobox.h"
-#endif
-
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
@@ -45,7 +41,7 @@ public:
          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,
@@ -58,28 +54,37 @@ public:
              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;
 
-    inline virtual int 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 void Enable(int item, bool enable);
-    virtual void Show(int item, bool show) ;
+    virtual wxString GetString(unsigned int item) const;
+    virtual void SetString(unsigned int item, const wxString& label);
 
-    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 
+// Other external functions
     void Command(wxCommandEvent& event);
     void SetFocus();
 
@@ -88,14 +93,14 @@ public:
     inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     void OnRadioButton( wxCommandEvent& event ) ;
+
 protected:
-    wxRadioButton        *m_radioButtonCycle;
+    wxRadioButton    *m_radioButtonCycle;
 
-    int               m_majorDim ;
-    int               m_noItems;
+    unsigned int      m_noItems;
     int               m_noRowsOrCols;
 
-// Internal functions 
+// Internal functions
     virtual wxSize DoGetBestSize() const ;
     virtual void DoSetSize(int x, int y,
                            int width, int height,