Committing in .

[wxWidgets.git] / src / common / radiocmn.cpp

diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index dbaae7076d91fb1d994a84276dc5a3efcdb5ee82..0d2851632fc5bd9e2c75d49156f1d87b192535f2 100644 (file)
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -34,6 +34,26 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+void wxRadioBoxBase::SetMajorDim(int majorDim, long style)
+{
+    wxCHECK_RET( majorDim != 0, _T("major radiobox dimension can't be 0") );
+
+    m_majorDim = majorDim;
+
+    int minorDim = (GetCount() + m_majorDim - 1) / m_majorDim;
+
+    if ( style & wxRA_SPECIFY_COLS )
+    {
+        m_numCols = majorDim;
+        m_numRows = minorDim;
+    }
+    else // wxRA_SPECIFY_ROWS
+    {
+        m_numCols = minorDim;
+        m_numRows = majorDim;
+    }
+}
+

 int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
 {
     int count = GetCount(),
 int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
 {
     int count = GetCount(),


@@ -144,23 +164,4 @@ void wxRadioBoxBase::SetNumberOfRowsOrCols(int WXUNUSED(n))
 
 #endif // WXWIN_COMPATIBILITY_2_4
 
 
 #endif // WXWIN_COMPATIBILITY_2_4
 

-#if WXWIN_COMPATIBILITY_2_2
-
-int wxRadioBoxBase::Number() const
-{
-    return GetCount();
-}
-
-wxString wxRadioBoxBase::GetLabel(int n) const
-{
-    return GetString(n);
-}
-
-void wxRadioBoxBase::SetLabel(int n, const wxString& label)
-{
-    SetString(n, label);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-

 #endif // wxUSE_RADIOBOX
 #endif // wxUSE_RADIOBOX