Merge new item attributes if any are already existing

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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 7b8e0b9e7fd619e542032f32fdf617756a40f1aa..da6e2588685f4c460fa39c2ef1d001b05555c308 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -13,16 +13,20 @@
 
 #if wxUSE_RADIOBOX
 
-#include "wx/arrstr.h"
 #include "wx/radiobox.h"
-#include "wx/radiobut.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/radiobut.h"
+    #include "wx/arrstr.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
-EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )
+    EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )
 END_EVENT_TABLE()
 
 
@@ -32,10 +36,10 @@ void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
     {
         wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId );
         int i = GetSelection() ;
-        event.SetInt( i );
-        event.SetString( GetString( i ) );
+        event.SetInt(i);
+        event.SetString(GetString(i));
         event.SetEventObject( this );
-        ProcessCommand( event );
+        ProcessCommand(event);
     }
 }
 
@@ -97,7 +101,7 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     int i;
 
-    m_noItems = (size_t)n;
+    m_noItems = (unsigned int)n;
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
@@ -124,7 +128,7 @@ bool wxRadioBox::Create( wxWindow *parent,
         wxRadioButton *radBtn = new wxRadioButton(
             this,
             wxID_ANY,
-            wxStripMenuCodes(choices[i]),
+            GetLabelText(choices[i]),
             wxPoint( 5, 20 * i + 10 ),
             wxDefaultSize,
             i == 0 ? wxRB_GROUP : 0 );
@@ -150,7 +154,7 @@ bool wxRadioBox::Enable(bool enable)
         return false;
 
     current = m_radioButtonCycle;
-    for (size_t i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)
     {
         current->Enable( enable );
         current = current->NextInCycle();
@@ -161,16 +165,13 @@ bool wxRadioBox::Enable(bool enable)
 
 // Enables or disables an given button
 //
-bool wxRadioBox::Enable(int item, bool enable)
+bool wxRadioBox::Enable(unsigned int item, bool enable)
 {
-    int i;
-    wxRadioButton *current;
-
     if (!IsValid( item ))
         return false;
 
-    i = 0;
-    current = m_radioButtonCycle;
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
     while (i != item)
     {
         i++;
@@ -189,15 +190,14 @@ wxString wxRadioBox::GetLabel() const
 
 // Returns the label for the given button
 //
-wxString wxRadioBox::GetString(int item) const
+wxString wxRadioBox::GetString(unsigned int item) const
 {
-    int i;
     wxRadioButton *current;
 
     if (!IsValid( item ))
         return wxEmptyString;
 
-    i = 0;
+    unsigned int i = 0;
     current = m_radioButtonCycle;
     while (i != item)
     {
@@ -235,16 +235,13 @@ void wxRadioBox::SetLabel(const wxString& label)
 
 // Sets the label of a given button
 //
-void wxRadioBox::SetString(int item,const wxString& label)
+void wxRadioBox::SetString(unsigned int item,const wxString& label)
 {
-    int i;
-    wxRadioButton *current;
-
     if (!IsValid( item ))
         return;
 
-    i = 0;
-    current = m_radioButtonCycle;
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
     while (i != item)
     {
         i++;
@@ -283,7 +280,7 @@ bool wxRadioBox::Show(bool show)
     wxRadioButton *current;
 
     current = m_radioButtonCycle;
-    for (size_t i=0; i<m_noItems; i++)
+    for (unsigned int i=0; i<m_noItems; i++)
     {
         current->Show( show );
         current = current->NextInCycle();
@@ -296,16 +293,13 @@ bool wxRadioBox::Show(bool show)
 
 // Shows or hides the given button
 //
-bool wxRadioBox::Show(int item, bool show)
+bool wxRadioBox::Show(unsigned int item, bool show)
 {
-    int i;
-    wxRadioButton *current;
-
     if (!IsValid( item ))
         return false;
 
-    i = 0;
-    current = m_radioButtonCycle;
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
     while (i != item)
     {
         i++;
@@ -327,14 +321,11 @@ void wxRadioBox::Command( wxCommandEvent& event )
 //
 void wxRadioBox::SetFocus()
 {
-    int i;
     wxRadioButton *current;
 
-    i = 0;
     current = m_radioButtonCycle;
     while (!current->GetValue())
     {
-        i++;
         current = current->NextInCycle();
     }
 
@@ -383,9 +374,9 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     maxWidth = -1;
     maxHeight = -1;
-    for (size_t i = 0 ; i < m_noItems; i++)
+    for (unsigned int i = 0 ; i < m_noItems; i++)
     {
-        GetTextExtent( GetString( i ), &eachWidth[i], &eachHeight[i] );
+        GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );
         eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
         eachHeight[i] = (int)((3 * eachHeight[i]) / 2);
 
@@ -473,9 +464,9 @@ wxSize wxRadioBox::DoGetBestSize() const
     maxWidth = -1;
     maxHeight = -1;
 
-    for (size_t i = 0 ; i < m_noItems; i++)
+    for (unsigned int i = 0 ; i < m_noItems; i++)
     {
-        GetTextExtent( GetString( i ), &eachWidth, &eachHeight, NULL, NULL, &font );
+        GetTextExtent(GetString(i), &eachWidth, &eachHeight, NULL, NULL, &font );
         eachWidth  = (int)(eachWidth + RADIO_SIZE);
         eachHeight = (int)((3 * eachHeight) / 2);
         if (maxWidth < eachWidth)