disabled wxMBConv(wxFONTENCODING_UTF7) test -- it doesn't work under Unix with iconv()

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

diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 23d05281d6de9d864cc7a1cfcf8a294f04723726..17b4f8951b37040f731aabeb5ef7db01cad6d7b8 100644 (file)
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -84,16 +84,17 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 

-    virtual size_t GetCount() const { return m_buttons.GetCount(); }
+    virtual unsigned int GetCount() const
+        { return (unsigned int)m_buttons.GetCount(); }

 
 

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

 
 

-    virtual bool Enable(int n, bool enable = true);
-    virtual bool Show(int n, bool show = true);
+    virtual bool Enable(unsigned int n, bool enable = true);
+    virtual bool Show(unsigned int n, bool show = true);

 
 

-    virtual bool IsItemEnabled(int n) const;
-    virtual bool IsItemShown(int n) const;
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;

 
     // we also override the wxControl methods to avoid virtual function hiding
     virtual bool Enable(bool enable = true);
 
     // we also override the wxControl methods to avoid virtual function hiding
     virtual bool Enable(bool enable = true);


@@ -101,8 +102,9 @@ public:
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label);
 
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label);
 

-    // we inherit a version returning false from wxStaticBox, override it again
-    virtual bool AcceptsFocus() const { return true; }
+    // we inherit a version always returning false from wxStaticBox, override
+    // it to behave normally
+    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }

 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );