Reduced unnecessary painting; delete/recreate caret as WIN32 requires

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

diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 6072641499de7f95bb96bc736c5c586101c60e15..a90b95b29988610c795c599e55f2299165f0ebe4 100644 (file)
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_RADIOBOX_H_
 #define _WX_UNIV_RADIOBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univradiobox.h"
-#endif
-
 class WXDLLEXPORT wxRadioButton;
 
 #include "wx/statbox.h"
@@ -88,22 +84,25 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
-    virtual int GetCount() const { return m_buttons.GetCount(); }
+    virtual int GetCount() const { return (int) m_buttons.GetCount(); }
     virtual int GetColumnCount() const { return m_numCols; }
     virtual int GetRowCount() const { return m_numRows; }
 
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
 
-    virtual void Enable(int n, bool enable = TRUE);
-    virtual void Show(int n, bool show = TRUE);
+    virtual bool Enable(int n, bool enable = true);
+    virtual bool Show(int n, bool show = true);
 
     // we also override the wxControl methods to avoid virtual function hiding
-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
+    virtual bool Enable(bool enable = true);
+    virtual bool Show(bool show = true);
     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; }
+
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
@@ -129,9 +128,6 @@ protected:
     // common part of all ctors
     void Init();
 
-    // check that the index is valid
-    bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
-
     // sets m_majorDim and calculate m_numCols and m_numRows
     void SetMajorDim(int majorDim);