Added missing include

[wxWidgets.git] / src / univ / radiobox.cpp

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 9fadd8eb266c44ebdcf72dd0a2c1f31b01a3c3c7..e4038b1a0d7d8511bb1be0e1da8a3b3cc3d08b4d 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univradiobox.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -99,7 +95,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 void wxRadioBox::Init()
 {
     m_selection = -1;
 void wxRadioBox::Init()
 {
     m_selection = -1;

-    m_majorDim = 0;

 }
 
 wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,


@@ -178,7 +173,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     Append(n, choices);
 
     // majorDim default value is 0 which means make one row/column
     Append(n, choices);
 
     // majorDim default value is 0 which means make one row/column

-    SetMajorDim(majorDim == 0 ? n : majorDim);
+    SetMajorDim(majorDim == 0 ? n : majorDim, style);

 
     if ( size == wxDefaultSize )
     {
 
     if ( size == wxDefaultSize )
     {


@@ -215,26 +210,6 @@ wxRadioBox::~wxRadioBox()
 // wxRadioBox init
 // ----------------------------------------------------------------------------
 
 // wxRadioBox init
 // ----------------------------------------------------------------------------
 

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

 void wxRadioBox::Append(int count, const wxString *choices)
 {
     if ( !count )
 void wxRadioBox::Append(int count, const wxString *choices)
 {
     if ( !count )


@@ -322,18 +297,32 @@ void wxRadioBox::SetString(int n, const wxString& label)
     m_buttons[n]->SetLabel(label);
 }
 
     m_buttons[n]->SetLabel(label);
 }
 

-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(int n, bool enable)
+{
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") );
+
+    return m_buttons[n]->Enable(enable);
+}
+
+bool wxRadioBox::IsItemEnabled(int n) const
+{
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemEnabled") );
+
+    return m_buttons[n]->IsEnabled();
+}
+
+bool wxRadioBox::Show(int n, bool show)

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Enable") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") );

 
 

-    m_buttons[n]->Enable(enable);
+    return m_buttons[n]->Show(show);

 }
 
 }
 

-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::IsItemShown(int n) const

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemShown") );

 
 

-    m_buttons[n]->Show(show);
+    return m_buttons[n]->IsShown();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -424,8 +413,8 @@ wxSize wxRadioBox::DoGetBestClientSize() const
 {
     wxSize sizeBtn = GetMaxButtonSize();
 
 {
     wxSize sizeBtn = GetMaxButtonSize();
 

-    sizeBtn.x *= m_numCols;
-    sizeBtn.y *= m_numRows;
+    sizeBtn.x *= GetColumnCount();
+    sizeBtn.y *= GetRowCount();

 
     // add a border around all buttons
     sizeBtn.x += 2*BOX_BORDER_X;
 
     // add a border around all buttons
     sizeBtn.x += 2*BOX_BORDER_X;


@@ -445,7 +434,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();

-    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
+    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);

 
     x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
     y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;
 
     x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
     y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;


@@ -461,7 +450,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
         if ( GetWindowStyle() & wxRA_TOPTOBOTTOM )
         {
             // from top to bottom
         if ( GetWindowStyle() & wxRA_TOPTOBOTTOM )
         {
             // from top to bottom

-            if ( (n + 1) % m_numRows )
+            if ( (n + 1) % GetRowCount() )

             {
                 // continue in this column
                 y += sizeBtn.y;
             {
                 // continue in this column
                 y += sizeBtn.y;


@@ -476,7 +465,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
         else // wxRA_LEFTTORIGHT: mirror the code above
         {
             // from left to right
         else // wxRA_LEFTTORIGHT: mirror the code above
         {
             // from left to right

-            if ( (n + 1) % m_numCols )
+            if ( (n + 1) % GetColumnCount() )

             {
                 // continue in this row
                 x += sizeBtn.x;
             {
                 // continue in this row
                 x += sizeBtn.x;