Minor source cleaning.

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

diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index bf88463af51503724a1c74a39171515ec8eb4706..32adee107ad468dddbe0ede761182327cbaf13f4 100644 (file)
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "radioboxbase.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -38,6 +34,26 @@
 // implementation
 // ============================================================================
 
+void wxRadioBoxBase::SetMajorDim(unsigned 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(),
@@ -148,24 +164,4 @@ void wxRadioBoxBase::SetNumberOfRowsOrCols(int WXUNUSED(n))
 
 #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
-