fixes for Unicode build with CodeWarrior under OS X 10.2 (patch 1373217)

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

diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index d74e0f3f5b5a3b4ceed3cc98e0104c633d917c4f..784b14da877061a429e820e2612bbe90b0e5fd4a 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"
@@ -32,7 +28,7 @@ class WXDLLEXPORT wxRadioBox : public wxStaticBox,
 {
 public:
     // wxRadioBox construction
-    wxRadioBox();
+    wxRadioBox() { Init(); }
 
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
@@ -43,6 +39,22 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, title, pos, size, n, choices,
+                     majorDim, style, val, name);
+    }
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 0,
+               long style = wxRA_SPECIFY_COLS,
+               const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr);
 
     bool Create(wxWindow *parent,
@@ -55,6 +67,16 @@ public:
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0,
+                long style = wxRA_SPECIFY_COLS,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);
 
     virtual ~wxRadioBox();
 
@@ -62,22 +84,26 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
-    virtual int GetCount() const { return m_buttons.GetCount(); }
-    virtual int GetColumnCount() const { return m_numCols; }
-    virtual int GetRowCount() const { return m_numRows; }
+    virtual int GetCount() const { return (int) m_buttons.GetCount(); }
 
     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);
+
+    virtual bool IsItemEnabled(int n) const;
+    virtual bool IsItemShown(int n) const;
 
     // 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
@@ -103,27 +129,12 @@ 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);
-
     // calculate the max size of all buttons
     wxSize GetMaxButtonSize() const;
 
     // the currently selected radio button or -1
     int m_selection;
 
-    // the parameters defining the button layout: majorDim meaning depends on
-    // the style and is the (max) number of columns if it includes
-    // wxRA_SPECIFY_COLS and is the (max) number of rows if it includes
-    // wxRA_SPECIFY_ROWS - the number of rows and columns is calculated from
-    // it
-    int m_majorDim,
-        m_numCols,
-        m_numRows;
-
     // all radio buttons
     wxArrayRadioButtons m_buttons;