make DoSetSizeHints protected, remove parameter defaults

[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 016e42ebd79dc2707f57c9ed601e52bbf68f7f3b..c7e6e4bd0e48e2207ffa88f085698280339d9bd2 100644 (file)
--- a/include/wx/mac/carbon/radiobox.h
+++ b/include/wx/mac/carbon/radiobox.h
@@ -13,9 +13,9 @@
 #define _WX_RADIOBOX_H_
 
 // List box item
 #define _WX_RADIOBOX_H_
 
 // List box item

-class WXDLLEXPORT wxBitmap ;
+class WXDLLIMPEXP_FWD_CORE wxBitmap ;

 
 

-class WXDLLEXPORT wxRadioButton ;
+class WXDLLIMPEXP_FWD_CORE wxRadioButton ;

 
 class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
 {
 
 class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
 {


@@ -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,7 +54,17 @@ 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 item) const;
+
+    // Showing
+    virtual bool Show(bool show = true);
+    virtual bool Show(unsigned int item, bool show = true);
+    virtual bool IsItemShown(unsigned int item) const;
+
+    // Specific functions (in wxWidgets2 reference)

     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 
     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 


@@ -63,13 +73,8 @@ public:
     virtual wxString GetString(unsigned int item) const;
     virtual void SetString(unsigned int item, const wxString& label);
 
     virtual wxString GetString(unsigned int item) const;
     virtual void SetString(unsigned int item, const wxString& label);
 

-    virtual bool Enable(unsigned int item, bool enable = true);
-    virtual bool Show(unsigned 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);