use WX_ASSERT_STR/SIZET_EQUAL instead of CPPUNIT_ASSERT_EQUAL with casts

[wxWidgets.git] / src / mac / carbon / radiobox.cpp

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 649aa592a2868c77b9ac7559675cb8015dba0fb7..68ad272a3c62648b4284ca4512f7212c0fcdf9de 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -107,7 +107,7 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     SetMajorDim( majorDim == 0 ? n : majorDim, style );
 
 
     SetMajorDim( majorDim == 0 ? n : majorDim, style );
 

-    m_label = label;
+    m_labelOrig = m_label = label;

 
     Rect bounds = wxMacGetBoundsForControl( this, pos, size );
     if ( bounds.right <= bounds.left )
 
     Rect bounds = wxMacGetBoundsForControl( this, pos, size );
     if ( bounds.right <= bounds.left )


@@ -321,14 +321,11 @@ void wxRadioBox::Command( wxCommandEvent& event )
 //
 void wxRadioBox::SetFocus()
 {
 //
 void wxRadioBox::SetFocus()
 {

-    int i;

     wxRadioButton *current;
 
     wxRadioButton *current;
 

-    i = 0;

     current = m_radioButtonCycle;
     while (!current->GetValue())
     {
     current = m_radioButtonCycle;
     while (!current->GetValue())
     {

-        i++;

         current = current->NextInCycle();
     }
 
         current = current->NextInCycle();
     }