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 a90b95b29988610c795c599e55f2299165f0ebe4..784b14da877061a429e820e2612bbe90b0e5fd4a 100644 (file)
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -85,8 +85,6 @@ public:
     virtual int GetSelection() const;
 
     virtual int GetCount() const { return (int) m_buttons.GetCount(); }
     virtual int GetSelection() const;
 
     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 wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);


@@ -94,6 +92,9 @@ public:
     virtual bool Enable(int n, bool enable = true);
     virtual bool 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);
     // we also override the wxControl methods to avoid virtual function hiding
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);


@@ -128,24 +129,12 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // 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;
 
     // 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;
 
     // all radio buttons
     wxArrayRadioButtons m_buttons;